3 files changed, 3 insertions, 37 deletions
diff --git a/packages/cumulus/cumulus_1.2.1.bb b/packages/cumulus/cumulus_1.2.1.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/cumulus/cumulus_1.2.1.bb
diff --git a/packages/cumulus/cumulus_1.2.bb b/packages/cumulus/cumulus_1.2.bb
deleted file mode 100644
index 01af252e44..0000000000
--- a/packages/cumulus/cumulus_1.2.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-DESCRIPTION = "A flightcomputer application for Qt/E based Palmtop Environments"
-SECTION = "opie/applications"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-LICENSE = "GPL"
-APPTYPE = "binary"
-APPNAME = "cumulus"
-APPDESKTOP = "${S}"
-PR = "r0"
-
-SRC_URI = "http://cumulus.kflog.org/download/src/cumulus-${PV}.src.tar.bz2 \
-           file://qtooltip.patch;patch=1"
-S = "${WORKDIR}/cumulus-arm-${PV}/cumulus"
-
-inherit opie
-
-export OE_QMAKE_LINK="${CXX}"
-EXTRA_QMAKEVARS_POST = "INCLUDEPATH+=-I."
-
-#
-# nasty hack since cumulus doesn't obey the qmake standard which requires just one .pro file per directory
-#
-do_compile() {
-	qmake -makefile -spec ${QMAKESPEC} -after ${EXTRA_QMAKEVARS_POST} cumulus.pro
-	oe_runmake
-	qmake -makefile -spec ${QMAKESPEC} -after ${EXTRA_QMAKEVARS_POST} gpsClient.pro 
-	oe_runmake
-}
-
-do_install() {
-        install -d ${D}${palmtopdir}/pics/mapicons
-        install -m 0644 ../cumulus.png ${D}${palmtopdir}/pics/cumulus.png
-        cp -a map-icons/* ${D}${palmtopdir}/pics/mapicons
-
-	install -m 0755 gpsClient ${D}${palmtopdir}/bin/
-}
diff --git a/packages/cumulus/cumulus_cvs.bb b/packages/cumulus/cumulus_cvs.bb
index d6f8e51064..1fda3d2fde 100644
--- a/packages/cumulus/cumulus_cvs.bb
+++ b/packages/cumulus/cumulus_cvs.bb
@@ -7,13 +7,15 @@ APPTYPE = "binary"
 APPNAME = "cumulus"
 APPDESKTOP = "${S}"
 PV = "1.2+cvs-${CVSDATE}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://cumulus.kflog.org/download/snapshot/cumulus-snapshot.tbz"
 S = "${WORKDIR}/cumulus/cumulus"
 
 inherit opie
 
+DEFAULT_PREFERENCE = "-1"
+
 export OE_QMAKE_LINK="${CXX}"
 EXTRA_QMAKEVARS_POST = "INCLUDEPATH+=-I."