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

into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/08/24 20:19:46+02:00 uni-frankfurt.de!mickey
use RRECOMMENDS instead of RDEPENDS for optional dependencies in Opie

BKrev: 412c48ef3echUuJA4RCMO0eQC0Nv1w

diff --git a/opie-calibrate/opie-calibrate_cvs.oe b/opie-calibrate/opie-calibrate_cvs.oe
index 8688a61..ad23200 100644 (file)
--- a/opie-calibrate/opie-calibrate_cvs.oe
+++ b/opie-calibrate/opie-calibrate_cvs.oe
@@ -1,9 +1,8 @@
-DESCRIPTION = "Opie Calibrate"
+DESCRIPTION = "Opie Standalone Touchscreen Calibration Utility"
 SECTION = "opie/base"
 PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
-RDEPENDS = "libqpe1"
 PV = "1.1.5-cvs-${CVSDATE}"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/apps/calibrate"

diff --git a/opie-citytime/opie-citytime_cvs.oe b/opie-citytime/opie-citytime_cvs.oe
index 07d3bf7..17f5b11 100644 (file)
--- a/opie-citytime/opie-citytime_cvs.oe
+++ b/opie-citytime/opie-citytime_cvs.oe
@@ -3,19 +3,18 @@ SECTION = "opie/settings"
 PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
-RDEPENDS = "timezones"
+RRECOMMENDS = "timezones"
 PV = "1.1.5-cvs-${CVSDATE}"
+
 APPNAME = "citytime"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/settings/citytime \
            cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
            cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
-
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
 
-# FILES plugins/application/libcitytime.so* bin/citytime apps/Settings/citytime.desktop pics/citytime
 do_install() {
         install -d ${D}${palmtopdir}/pics/${APPNAME}/
         install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/

diff --git a/opie-systemtime/opie-systemtime_cvs.oe b/opie-systemtime/opie-systemtime_cvs.oe
index df8e921..a04c413 100644 (file)
--- a/opie-systemtime/opie-systemtime_cvs.oe
+++ b/opie-systemtime/opie-systemtime_cvs.oe
@@ -1,9 +1,11 @@
-DESCRIPTION = "System time"
+DESCRIPTION = "Set the system time - utilizing ntpdate, if available."
 SECTION = "opie/settings"
 PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
+RRECOMMENDS = "ntpdate"
 PV = "1.1.5-cvs-${CVSDATE}"
+
 APPNAME = "systemtime"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/settings/netsystemtime \

diff --git a/opie-wellenreiter/opie-wellenreiter_1.0.3.oe b/opie-wellenreiter/opie-wellenreiter_1.0.3.oe
index 0d7694c..2bf7411 100644 (file)
--- a/opie-wellenreiter/opie-wellenreiter_1.0.3.oe
+++ b/opie-wellenreiter/opie-wellenreiter_1.0.3.oe
@@ -3,8 +3,8 @@ SECTION = "opie/applications"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-RDEPENDS = "manufacturers"
-PR = "r1"
+RRECOMMENDS = "manufacturers"
+PR = "r2"
 
 APPNAME = "wellenreiter"
 APPTYPE = "binary"
@@ -12,7 +12,6 @@ APPTYPE = "binary"
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/net/wellenreiter;date=20040504 \
            cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics;date=20040504                     \
            cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps;date=20040504"
-
 S = "${WORKDIR}/wellenreiter"
 
 inherit opie