opie-bluetoothmanager: catch up with recent changes in the opie cvs

depend on obexftp and show where to find its headers

diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc b/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc
index f5ebf88..fbc9a06 100644 (file)
--- a/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc
+++ b/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "Bluetooth manager for Opie"
 SECTION = "opie/settings"
 PRIORITY = "optional"
-DEPENDS = "libopietooth1"
+DEPENDS = "libopietooth1 obexftp"
 RDEPENDS = "opie-bluepin"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
@@ -10,6 +10,7 @@ APPNAME = "bluetooth-manager"
 S = "${WORKDIR}/manager"
 
 EXTRA_QMAKEVARS_POST += " INCLUDEPATH+=${STAGING_INCDIR}/opietooth "
+EXTRA_QMAKEVARS_PRE = 'LIBOBEXFTP_INC_DIR=${STAGING_INCDIR}/obexftp'
 
 inherit opie
 

diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.1.bb b/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.1.bb
index b048a02..7f02240 100644 (file)
--- a/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.1.bb
+++ b/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.1.bb
@@ -1,6 +1,5 @@
 include ${PN}.inc
-    
- 
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/manager \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \

diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb b/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb
index f6040cf..0dcb908 100644 (file)
--- a/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb
+++ b/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb
@@ -1,6 +1,6 @@
 include ${PN}.inc
-    
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/manager \
            ${HANDHELDS_CVS};module=opie/apps \