From: Holger Freyther Date: Thu, 28 Oct 2004 20:59:38 +0000 (+0000) Subject: Merge bk://openembedded@openembedded.bkbits.net/packages-devel X-Git-Tag: Release-2010-05/1~16442 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92b6e4b161e61b36e7d576eb07c8df97e0632ca6;p=openembedded.git Merge bk://openembedded@openembedded.bkbits.net/packages-devel into handhelds.org:/home/ich/programming/oe/oe-packages-exported 2004/10/28 22:50:36+02:00 handhelds.org!zecke Opie CVS: -Upstream switched from sqlite2 to sqlite3 so adjust to the switch -OpiePIMConverter can convert from sqlite2 to sqlite3 when the cli tools are present so depend on them for now BKrev: 41815dbavp14COcXtBTWrWt9k7jMEA --- diff --git a/libopie/libopie2_cvs.oe b/libopie/libopie2_cvs.oe index 7e3fa5f42b..daaa4d70be 100644 --- a/libopie/libopie2_cvs.oe +++ b/libopie/libopie2_cvs.oe @@ -4,8 +4,8 @@ SECTION = "opie/libs" MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "LGPL" I18N_FILES = "libopiecore2.ts libopiesecurity2.ts" -DEPENDS = "libqpe-opie sqlite libpcap-0.7.2 virtual/kernel" -PR = "r3" +DEPENDS = "libqpe-opie sqlite3 libpcap-0.7.2 virtual/kernel" +PR = "r4" PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2" PV = "1.1.6+cvs-${CVSDATE}" diff --git a/opie-pimconverter/opie-pimconverter_cvs.oe b/opie-pimconverter/opie-pimconverter_cvs.oe index fe1868aeaf..1b527aa16c 100644 --- a/opie-pimconverter/opie-pimconverter_cvs.oe +++ b/opie-pimconverter/opie-pimconverter_cvs.oe @@ -3,10 +3,12 @@ SECTION = "opie/pim" PRIORITY = "optional" MAINTAINER = "Team Opie " LICENSE = "GPL" -DEPENDS = "sqlite" +RDEPENDS = "sqlite3 sqlite" +#RDEPENDS = "sqlite3-bin sqlite-bin" + PV = "1.1.6+cvs-${CVSDATE}" +PR = "r3" APPNAME = "opimconverter" -APPTYPE = "binary" SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/tools/pimconverter \ cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \