Merge bk://openembedded@openembedded.bkbits.net/packages

into alwin.at.home:/home/ral/progs/Zaurus/oe/oe/packages

2004/08/02 00:43:55+02:00 home!ral
keyz-config and zkbapplet made to one project

BKrev: 410d7235KVgrGelGuSXtJswycoMCbg

diff --git a/opie-keyz-cfg/opie-keyz-cfg_cvs.oe b/opie-keyz-cfg/opie-keyz-cfg_cvs.oe
deleted file mode 100644 (file)
index bd047fc..0000000
--- a/opie-keyz-cfg/opie-keyz-cfg_cvs.oe
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Settings application for the zkbapplet"
-SECTION = "opie/settings"
-PRIORITY = "optional"
-MAINTAINER = "Open Embedded <oe@handhelds.org>"
-LICENSE = "GPL"
-RDEPENDS = "opie-pics"
-PV = "1.1.5-cvs-${CVSDATE}"
-APPNAME = "keyz-cfg"
-APPTYPE = "binary"
-PR = "r1"
-
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/keyz-cfg \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
-
-S = "${WORKDIR}/keyz-cfg"
-
-inherit opie
-

diff --git a/opie-zkbapplet/opie-zkbapplet/path.patch b/opie-zkbapplet/opie-zkbapplet/path.patch
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/opie-zkbapplet/opie-zkbapplet_cvs.oe b/opie-zkbapplet/opie-zkbapplet_cvs.oe
index 2be8cbd..28f7fbe 100644 (file)
--- a/opie-zkbapplet/opie-zkbapplet_cvs.oe
+++ b/opie-zkbapplet/opie-zkbapplet_cvs.oe
@@ -3,15 +3,13 @@ SECTION = "opie/applets"
 PRIORITY = "optional"
 MAINTAINER = "Open Embedded <oe@handhelds.org>"
 LICENSE = "GPL"
-RDEPENDS = "opie-keyz-cfg"
 PV = "1.1.5-cvs-${CVSDATE}"
 APPNAME = "zkbapplet"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/applets/zkbapplet \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/keyz-cfg \
            cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/share \
            cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
-                  file://path.patch;patch=1"
+           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
 
 S = "${WORKDIR}/${APPNAME}"
 
@@ -26,7 +24,12 @@ test -f $OPIEDIR/share/zkb/zkb.xml || cp $OPIEDIR/share/zkb/zkb.xml.sample $OPIE
 do_install() {
         install -d ${D}${palmtopdir}/pics/
         install -m 0644 ${WORKDIR}/pics/zkb-disabled.png ${D}${palmtopdir}/pics/
+        install -m 0644 ${WORKDIR}/pics/keyz-cfg.png ${D}${palmtopdir}/pics/
         install -d ${D}${palmtopdir}/share/zkb/
         install -m 0644 ${WORKDIR}/share/zkb/*xml* ${D}${palmtopdir}/share/zkb/
+        install -d ${D}${palmtopdir}/bin
+        install -m 0755 ${S}/keyz-cfg ${D}${palmtopdir}/bin/
+        install -d ${D}${palmtopdir}/apps/Settings
+        install -m 0644 ${WORKDIR}/apps/Settings/keyz-cfg.desktop ${D}${palmtopdir}/apps/Settings/
 }