opie-pimconverter: fixed dependency on both SQLite versions

diff --git a/packages/opie-pimconverter/opie-pimconverter.inc b/packages/opie-pimconverter/opie-pimconverter.inc
index b19f4cc..2bc2c22 100644 (file)
--- a/packages/opie-pimconverter/opie-pimconverter.inc
+++ b/packages/opie-pimconverter/opie-pimconverter.inc
@@ -3,8 +3,8 @@ SECTION = "opie/pim"
 PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
-RDEPENDS = "sqlite3 sqlite" 
-#RDEPENDS = "sqlite3-bin sqlite-bin"
+DEPENDS = "sqlite3 sqlite" 
+RDEPENDS = "sqlite3 libsqlite-bin" 
 
 APPNAME = "opimconverter"
 

diff --git a/packages/opie-pimconverter/opie-pimconverter_1.2.1.bb b/packages/opie-pimconverter/opie-pimconverter_1.2.1.bb
index e3e979b..b1920c1 100644 (file)
--- a/packages/opie-pimconverter/opie-pimconverter_1.2.1.bb
+++ b/packages/opie-pimconverter/opie-pimconverter_1.2.1.bb
@@ -1,6 +1,6 @@
 include ${PN}.inc
-    
- 
+
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/pimconverter \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \

diff --git a/packages/opie-pimconverter/opie-pimconverter_cvs.bb b/packages/opie-pimconverter/opie-pimconverter_cvs.bb
index 902303b..4b35c87 100644 (file)
--- a/packages/opie-pimconverter/opie-pimconverter_cvs.bb
+++ b/packages/opie-pimconverter/opie-pimconverter_cvs.bb
@@ -1,6 +1,7 @@
 include ${PN}.inc
-    
+
 PV = "1.2.1+cvs-${CVSDATE}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/pimconverter \
            ${HANDHELDS_CVS};module=opie/pics \