summaryrefslogtreecommitdiff
path: root/packages/libopieobex
diff options
context:
space:
mode:
authorErik Hovland <erik@hovland.org>2006-05-19 23:10:29 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-05-19 23:10:29 +0000
commit5df2eacd530758fbd5cca526f606d2e95417c0ed (patch)
treebec832af2d49aca45cd4443a956c221fe0e1b0ee /packages/libopieobex
parent9c257cb57a9bc7bbbf90310cf592aeaa24cc1960 (diff)
parentc2420f459bde3d91cc8fc4b585e1ba49edb858f0 (diff)
merge of 46c1cdea7bf65d8ba6bbe951e7408d24d5b05d06
and 8cd65284f1d330175ae2d67c03b8a2c1b41e858a
Diffstat (limited to 'packages/libopieobex')
-rw-r--r--packages/libopieobex/libopieobex0.inc4
-rw-r--r--packages/libopieobex/libopieobex0_1.2.1.bb2
-rw-r--r--packages/libopieobex/libopieobex0_cvs.bb2
3 files changed, 5 insertions, 3 deletions
diff --git a/packages/libopieobex/libopieobex0.inc b/packages/libopieobex/libopieobex0.inc
index 7a514fa68a..15640c530d 100644
--- 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 openobex-apps"
+DEPENDS = "libopietooth1 opie-taskbar openobex-apps"
RDEPENDS = "openobex-apps"
APPNAME = "obex"
@@ -11,6 +11,8 @@ S = "${WORKDIR}/obex"
inherit opie
+EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/opietooth"
+
do_install() {
install -d ${D}${palmtopdir}/pics/${APPNAME}/ ${D}${palmtopdir}/plugins/obex/
install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
diff --git a/packages/libopieobex/libopieobex0_1.2.1.bb b/packages/libopieobex/libopieobex0_1.2.1.bb
index d80a2a664f..5e7c51e7cc 100644
--- a/packages/libopieobex/libopieobex0_1.2.1.bb
+++ b/packages/libopieobex/libopieobex0_1.2.1.bb
@@ -1,6 +1,6 @@
include libopieobex0.inc
-PR = "r1"
+PR = "r2"
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 c51ca8ecc6..ed160d86c8 100644
--- a/packages/libopieobex/libopieobex0_cvs.bb
+++ b/packages/libopieobex/libopieobex0_cvs.bb
@@ -1,6 +1,6 @@
include libopieobex0.inc
PV = "${OPIE_CVS_PV}"
-PR = "r1"
+PR = "r2"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \
${HANDHELDS_CVS};module=opie/pics"