upgrade sword and move opie-dagger (which has been fixed upstream) out of nonworking

BKrev: 40f7fdb0CBqWoAo8WDdjJnvQAPzzFw

diff --git a/nonworking/opie/opie-dagger_cvs.oe b/nonworking/opie/opie-dagger_cvs.oe
deleted file mode 100644 (file)
index 3811663..0000000
--- a/nonworking/opie/opie-dagger_cvs.oe
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "A Bible study program utilizing the Sword library."
-SECTION = "opie/applications"
-PRIORITY = "optional"
-MAINTAINER = "Open Embedded <oe@handhelds.org>"
-LICENSE = "GPL"
-DEPENDS = "libopiecore2 libopieui2 sword"
-PV = "1.1.3-cvs-${CVSDATE}"
-APPNAME = "dagger"
-
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/dagger;date=${CVSDATE} \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics;date=${CVSDATE} \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps;date=${CVSDATE}"
-
-S = "${WORKDIR}/${APPNAME}"
-
-inherit opie
-
-# FILES plugins/application/libdagger.so* bin/dagger pics/dagger apps/Applications/dagger.desktop
-do_install() {
-        install -d ${D}${palmtopdir}/pics/${APPNAME}/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-}
-

diff --git a/opie-dagger/opie-dagger_cvs.oe b/opie-dagger/opie-dagger_cvs.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/sword/sword_1.5.7.oe b/sword/sword_1.5.7.oe
index f599abe..3eba7c6 100644 (file)
--- a/sword/sword_1.5.7.oe
+++ b/sword/sword_1.5.7.oe
@@ -4,10 +4,9 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "clucene curl"
 RDEPENDS = "clucene curl"
-PR = "2"
+PR = "r3"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/s/sword/sword_${PV}.orig.tar.gz \
-           ${DEBIAN_MIRROR}/main/s/sword/sword_${PV}-${PR}.diff.gz;patch=1"
+SRC_URI = "http://www.crosswire.org/~dglassey/sword-1.5.7a.tar.gz"
 
 inherit autotools