Merge oe-devel@oe-devel.bkbits.net:openembedded

into flotta.cambridgebroadband.com:/development/openembedded/openembedded

2005/02/17 15:31:43+01:00 uni-frankfurt.de!mickeyl
catch up with opie-tonleiter upstream changes (it's quicklaunch)

BKrev: 4214ac9dsrS--zQL6TnpDuPKYVaUQg

diff --git a/packages/opie-tonleiter/opie-tonleiter_1.1.9.bb b/packages/opie-tonleiter/opie-tonleiter_1.1.9.bb
index f35bfb4..05acb9f 100644 (file)
--- a/packages/opie-tonleiter/opie-tonleiter_1.1.9.bb
+++ b/packages/opie-tonleiter/opie-tonleiter_1.1.9.bb
@@ -3,10 +3,8 @@ SECTION = "opie/multimedia"
 PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
-
 APPNAME = "tonleiter"
-APPTYPE = "binary"
-
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/tonleiter \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
@@ -16,7 +14,6 @@ S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
 
-# FILES bin/tonleiter pics/tonleiter apps/Applications/tonleiter.desktop
 do_install() {
         install -d ${D}${palmtopdir}/pics/${APPNAME}/
         install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/

diff --git a/packages/opie-tonleiter/opie-tonleiter_cvs.bb b/packages/opie-tonleiter/opie-tonleiter_cvs.bb
index 8c7a24d..a1d17bd 100644 (file)
--- a/packages/opie-tonleiter/opie-tonleiter_cvs.bb
+++ b/packages/opie-tonleiter/opie-tonleiter_cvs.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 PV = "1.1.9+cvs-${CVSDATE}"
 APPNAME = "tonleiter"
-APPTYPE = "binary"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/tonleiter \
            ${HANDHELDS_CVS};module=opie/pics \
@@ -15,7 +15,6 @@ S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
 
-# FILES bin/tonleiter pics/tonleiter apps/Applications/tonleiter.desktop
 do_install() {
         install -d ${D}${palmtopdir}/pics/${APPNAME}/
         install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/