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,9 +1,10 @@
 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
 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