libopieobex: DEPEND on openobex-apps, not just RDEPEND on it

(to make it available @ image construction time)

diff --git a/packages/libopieobex/libopieobex0.inc b/packages/libopieobex/libopieobex0.inc
index 40475cf..7a514fa 100644 (file)
--- a/packages/libopieobex/libopieobex0.inc
+++ b/packages/libopieobex/libopieobex0.inc
@@ -3,7 +3,7 @@ SECTION = "opie/libs"
 PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "LGPL"
-DEPENDS = "opie-taskbar"
+DEPENDS = "opie-taskbar openobex-apps"
 RDEPENDS = "openobex-apps"
 APPNAME = "obex"
 
@@ -12,8 +12,8 @@ S = "${WORKDIR}/obex"
 inherit opie
 
 do_install() {
-        install -d ${D}${palmtopdir}/pics/${APPNAME}/ ${D}${palmtopdir}/plugins/obex/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+       install -d ${D}${palmtopdir}/pics/${APPNAME}/ ${D}${palmtopdir}/plugins/obex/
+       install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
        oe_libinstall -so libopieobex ${D}${palmtopdir}/plugins/obex/
 }
 

diff --git a/packages/libopieobex/libopieobex0_1.2.1.bb b/packages/libopieobex/libopieobex0_1.2.1.bb
index f5a2b1b..2e6b38b 100644 (file)
--- a/packages/libopieobex/libopieobex0_1.2.1.bb
+++ b/packages/libopieobex/libopieobex0_1.2.1.bb
@@ -1,5 +1,5 @@
 include libopieobex0.inc
-
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/obex \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics      "

diff --git a/packages/libopieobex/libopieobex0_cvs.bb b/packages/libopieobex/libopieobex0_cvs.bb
index 3ea7522..40d4dd8 100644 (file)
--- a/packages/libopieobex/libopieobex0_cvs.bb
+++ b/packages/libopieobex/libopieobex0_cvs.bb
@@ -1,6 +1,6 @@
 include libopieobex0.inc
-
 PV = "1.2.1+cvs-${CVSDATE}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \
            ${HANDHELDS_CVS};module=opie/pics"