propagate from branch 'org.openembedded.dev' (head 99876a04715cb6df80cabdbeed48323d46e1d6f5)

            to branch 'org.openembedded.nslu2-linux' (head 81b86311881ea1cfcefb9ba59a1236c15c7a1133)

3 files changed, 25 insertions, 12 deletions

diff --git a/packages/libopie/libopie2.inc b/packages/libopie/libopie2.inc
index 75648b3c79..66b3aebc1e 100644
--- a/packages/libopie/libopie2.inc
+++ b/packages/libopie/libopie2.inc
@@ -22,6 +22,10 @@ EXTRA_QMAKEVARS_POST = 'DEFINES+=OPIE_NEW_MALLOC \
 
 EXTRA_QMAKEVARS_PRE = 'ENABLE_SQL_PIM_BACKEND=y'
 
+MODULES = "opiecore opiedb opiemm opienet opiepim opiesecurity opieui"
+LIBS    = "core2    db2    mm2    net2    pim2    security2    ui2"
+PRIVATE = "opimcontactsortvector.h opimoccurrence_p.h opimsortvector.h opimtodosortvector.h vobject_p.h opimeventsortvector.h"
+
 # uclibc doesn't have backtrace()
 python __anonymous () {
     import bb, re
@@ -32,7 +36,7 @@ python __anonymous () {
 do_compile() {
 	install -d ${STAGING_INCDIR}/opie2
 	install -d ${STAGING_INCDIR}/opie2/private
-        for module in opiecore opiedb opiemm opienet opiepim opiesecurity opieui
+        for module in ${MODULES}
         do
             cd $module
 	    for i in `find . -name "*.h"`
@@ -42,17 +46,14 @@ do_compile() {
             cd ..
         done
 
-	for i in opimcontactsortvector.h opimoccurrence_p.h opimsortvector.h opimtodosortvector.h vobject_p.h opimeventsortvector.h
+	for header in ${PRIVATE}
 	do
-		install -m 0644 opiepim/private/$i ${STAGING_INCDIR}/opie2/private/
+		install -m 0644 opiepim/private/$header ${STAGING_INCDIR}/opie2/private/
 	done
 
 	oe_runmake MOC=${STAGING_BINDIR}/moc UIC=${STAGING_BINDIR}/uic DESTDIR=${S}
 }
 
-LIBS = "core2 ui2 db2 mm2 net2 pim2 security2"
-
-# need some special case for uic-created header files here
 do_stage() {
         for f in ${LIBS}
 	do
@@ -60,6 +61,7 @@ do_stage() {
 	done
 
 	install -m 0644 ${WORKDIR}/include.pro ${OPIEDIR}/include.pro
+	# special case for uic-created header files
 	install -m 0644 opiepim/ui/opimrecurrencebase.h ${STAGING_INCDIR}/opie2/
 	install -m 0644 opieui/otimepickerbase.h ${STAGING_INCDIR}/opie2/
 	install -m 0644 opiepim/core/opimtemplatebase.h ${STAGING_INCDIR}/opie2/
@@ -73,14 +75,22 @@ do_install() {
 	done
 }
 
-PACKAGES = "libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2"
+PACKAGES = "libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2 libopiebluez2"
 
+DESCRIPTION_libopiecore2 = "Opie Development Platform 1.x Core Library"
 FILES_libopiecore2 = "${palmtopdir}/lib/libopiecore2.so*"
+DESCRIPTION_libopiedb2 = "Opie Development Platform 1.x Database Library"
 FILES_libopiedb2 = "${palmtopdir}/lib/libopiedb2.so*"
+DESCRIPTION_libopiemm2 = "Opie Development Platform 1.x Multimedia Library"
 FILES_libopiemm2 = "${palmtopdir}/lib/libopiemm2.so*"
+DESCRIPTION_libopienet2 = "Opie Development Platform 1.x Network Library"
 FILES_libopienet2 = "${palmtopdir}/lib/libopienet2.so*"
+DESCRIPTION_libopiepim2 = "Opie Development Platform 1.x PIM Library"
 FILES_libopiepim2 = "${palmtopdir}/lib/libopiepim2.so*"
+DESCRIPTION_libopieui2 = "Opie Development Platform 1.x User Interface Library"
 FILES_libopieui2 = "${palmtopdir}/lib/libopieui2.so*"
+DESCRIPTION_libopiesecurity2 = "Opie Development Platform 1.x Security Library"
 FILES_libopiesecurity2 = "${palmtopdir}/lib/libopiesecurity2.so*"
+DESCRIPTION_libopiebluez2 = "Opie Development Platform 1.x Bluetooth Library"
+FILES_libopiebluez2 = "${palmtopdir}/lib/libopiebluez2.so*"
 
-#FIXME: Add individual package descriptions and dependencies
diff --git a/packages/libopie/libopie2_1.2.0.bb b/packages/libopie/libopie2_1.2.0.bb
index 6c620abcfb..74bf375b55 100644
--- a/packages/libopie/libopie2_1.2.0.bb
+++ b/packages/libopie/libopie2_1.2.0.bb
@@ -1,7 +1,6 @@
 include ${PN}.inc
-    
- 
-PR = "r0"
+
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
            file://include.pro"
diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb
index a5cf0c8c34..0a1f1bea15 100644
--- a/packages/libopie/libopie2_cvs.bb
+++ b/packages/libopie/libopie2_cvs.bb
@@ -1,7 +1,11 @@
 include ${PN}.inc
-    
+
+DEPENDS += "bluez-libs"
 PV = "1.2.0+cvs-${CVSDATE}"
 PR = "r0"
 
+MODULES = "opiecore opiedb opiemm opienet opiepim opiesecurity opieui opiebluez"
+LIBS    = "core2    db2    mm2    net2    pim2    security2    ui2    bluez2"
+
 SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \
            file://include.pro"