From a8ce58df9771978d98beeb476be86a7e2a5ab190 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 27 Mar 2006 14:53:10 +0000 Subject: opie-bluetoothmanager: catch up with recent changes in the opie cvs depend on obexftp and show where to find its headers --- packages/opie-bluetoothmanager/opie-bluetoothmanager.inc | 3 ++- packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.1.bb | 3 +-- packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc b/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc index f5ebf88cb2..fbc9a06625 100644 --- 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 " 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 b048a02795..7f022404b1 100644 --- 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 f6040cfdd1..0dcb90892f 100644 --- 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 \ -- cgit v1.2.3