Merge bk://openembedded@openembedded.bkbits.net/packages

into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/07/18 12:35:24+02:00 handhelds.org!zecke
Merge bk://openembedded@openembedded.bkbits.net/packages
into handhelds.org:/home/ich/programming/oe/oe-packages-exported

2004/07/18 12:34:36+02:00 handhelds.org!zecke
Adjust to upstream changes to build libopiesecurity2 package and make
opie-taskbar and opie-security depend/link against it

BKrev: 40fa58d3cJnbRkOMrhI5_TGY0ut-nQ

diff --git a/libopie/libopie2_cvs.oe b/libopie/libopie2_cvs.oe
index 0fcfe86..1a3b6d6 100644 (file)
--- a/libopie/libopie2_cvs.oe
+++ b/libopie/libopie2_cvs.oe
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
 LICENSE = "LGPL"
 DEPENDS = "libqpe-opie sqlite libpcap-0.7.2 virtual/kernel"
-PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopienet2 libopiepim2 libopieui2"
+PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2 "
 PV = "1.1.4-cvs-${CVSDATE}"
 PR = "r1"
 
@@ -60,14 +60,17 @@ do_install() {
        oe_libinstall -so -C ${STAGING_LIBDIR} libopienet2 ${D}/${palmtopdir}/lib
        oe_libinstall -so -C ${STAGING_LIBDIR} libopiepim2 ${D}/${palmtopdir}/lib
        oe_libinstall -so -C ${STAGING_LIBDIR} libopieui2 ${D}/${palmtopdir}/lib
+       oe_libinstall -so -C ${STAGING_LIBDIR} libopiesecurity2 ${D}/${palmtopdir}/lib
 }
 
-PACKAGES = "libopiecore2 libopiedb2 libopiemm2 libopienet2 libopiepim2 libopieui2"
+PACKAGES = "libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2"
 FILES_libopiecore2 = "${palmtopdir}/lib/libopiecore2.so.*"
 FILES_libopiedb2 = "${palmtopdir}/lib/libopiedb2.so.*"
 FILES_libopiemm2 = "${palmtopdir}/lib/libopiemm2.so.*"
 FILES_libopienet2 = "${palmtopdir}/lib/libopienet2.so.*"
 FILES_libopiepim2 = "${palmtopdir}/lib/libopiepim2.so.*"
 FILES_libopieui2 = "${palmtopdir}/lib/libopieui2.so.*"
+FILES_libopiesecurity2 = "${palmtopdir}/lib/libopiesecurity2.so.*"
+
 
 #FIXME: Add individual package descriptions and dependencies

diff --git a/opie-taskbar/opie-taskbar/server.pro b/opie-taskbar/opie-taskbar/server.pro
index 58e4d63..fef0282 100644 (file)
--- a/opie-taskbar/opie-taskbar/server.pro
+++ b/opie-taskbar/opie-taskbar/server.pro
@@ -77,6 +77,6 @@ DEPENDPATH    += mediummount
 
 TARGET         = qpe
 
-LIBS = -lqpe -lopiecore2 -lopieui2 -lqrsync
+LIBS = -lqpe -lopiecore2 -lopieui2 -lopiesecurity2 -lqrsync
 
 include ( $(OPIEDIR)/include.pro )