Merge bk://oe-devel@oe-devel.bkbits.net/openembedded

into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/03 01:13:25+01:00 uni-frankfurt.de!mickeyl
fix libopie2 staging area

BKrev: 4202023dHtqtTAG7gtob3AWzv4OLng

diff --git a/packages/libopie/libopie2_1.1.9.bb b/packages/libopie/libopie2_1.1.9.bb
index bfeac45..569a879 100644 (file)
--- a/packages/libopie/libopie2_1.1.9.bb
+++ b/packages/libopie/libopie2_1.1.9.bb
@@ -41,7 +41,7 @@ do_compile() {
                install -m 0644 $i ${STAGING_INCDIR}/opie2/`basename $i`
        done
 
-       for i in opimcontactsortvector.h opimoccurrence_p.h opimsortvector.h opimtodosortvector.h vobject_p.h
+       for i in opimcontactsortvector.h opimoccurrence_p.h opimsortvector.h opimtodosortvector.h vobject_p.h opimeventsortvector.h
        do
                install -m 0644 opiepim/private/$i ${STAGING_INCDIR}/opie2/private/
        done

diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb
index 1fc11fe..e2b059b 100644 (file)
--- a/packages/libopie/libopie2_cvs.bb
+++ b/packages/libopie/libopie2_cvs.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPL"
 I18N_FILES = "libopiecore2.ts libopiesecurity2.ts"
 DEPENDS = "libqpe-opie sqlite3 libpcap"
 PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2"
-PR = "12"
+PR = "r12"
 PV = "1.1.8+cvs-${CVSDATE}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \