summaryrefslogtreecommitdiff
authoralwin <alwin>2004-03-21 01:56:47 (UTC)
committer alwin <alwin>2004-03-21 01:56:47 (UTC)
commit3b677269bee78dc65d4f2fa4556f44f67b3e744c (patch) (side-by-side diff)
treefc058ea7c8647dd67c9b84dedfbfbfa0195ecc66
parent7de6d81335e5e800f4bd3a3a9f507434f5fbcea2 (diff)
downloadopie-3b677269bee78dc65d4f2fa4556f44f67b3e744c.zip
opie-3b677269bee78dc65d4f2fa4556f44f67b3e744c.tar.gz
opie-3b677269bee78dc65d4f2fa4556f44f67b3e744c.tar.bz2
keyz-cfg and zkbapplet merged into one package
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/applets/zkbapplet/zkbapplet.control5
-rwxr-xr-xnoncore/applets/zkbapplet/zkbapplet.postinst (renamed from noncore/apps/keyz-cfg/keyz-cfg.postinst)0
-rw-r--r--noncore/apps/keyz-cfg/keyz-cfg.control9
3 files changed, 3 insertions, 11 deletions
diff --git a/noncore/applets/zkbapplet/zkbapplet.control b/noncore/applets/zkbapplet/zkbapplet.control
index 3004eff..b698d39 100644
--- a/noncore/applets/zkbapplet/zkbapplet.control
+++ b/noncore/applets/zkbapplet/zkbapplet.control
@@ -1,4 +1,4 @@
Package: zkbapplet
-Files: plugins/applets/libzkbapplet.so* pics/zkb-disabled.png share/zkb/*.xml
+Files: plugins/applets/libzkbapplet.so* pics/zkb-disabled.png share/zkb/*.xml bin/keyz-cfg apps/Settings/keyz-cfg.desktop pics/keyz-cfg.png share/zkb/zkb.xml.sample
Priority: optional
Section: opie/applets
@@ -6,4 +6,5 @@ Maintainer: Rajko Albrecht <alwin@handhelds.org>
Architecture: arm
Depends: task-opie-minimal, keyz-cfg
-Description: ZKB Applet
+Description: ZKB Applet and configuration program
+Obsoletes: keyz-cfg
Version: 0.6.0$EXTRAVERSION
diff --git a/noncore/apps/keyz-cfg/keyz-cfg.postinst b/noncore/applets/zkbapplet/zkbapplet.postinst
index c7d1cf4..c7d1cf4 100755
--- a/noncore/apps/keyz-cfg/keyz-cfg.postinst
+++ b/noncore/applets/zkbapplet/zkbapplet.postinst
diff --git a/noncore/apps/keyz-cfg/keyz-cfg.control b/noncore/apps/keyz-cfg/keyz-cfg.control
deleted file mode 100644
index ff0babe..0000000
--- a/noncore/apps/keyz-cfg/keyz-cfg.control
+++ b/dev/null
@@ -1,9 +0,0 @@
-Package: keyz-cfg
-Files: bin/keyz-cfg apps/Settings/keyz-cfg.desktop pics/keyz-cfg.png share/zkb/zkb.xml.sample
-Priority: optional
-Section: opie/applications
-Maintainer: Rajko Albrecht <alwin@handhelds.org>
-Architecture: arm
-Depends: task-opie-minimal
-Description: Keyz configuration program
-Version: 0.6.0$EXTRAVERSION