ubahnnav: upgrade to 0.4.1 and remove obsolete versions

diff --git a/packages/ubahnnav/ubahnnav_0.3.1.bb b/packages/ubahnnav/ubahnnav_0.3.1.bb
deleted file mode 100644 (file)
index 01d1a8a..0000000
--- a/packages/ubahnnav/ubahnnav_0.3.1.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "U-Bahn Navigator helps you navigating through foreign public \
-transport networks. It finds the shortest or direct route from a start to a \
-destination station of the loaded subway map. U-Bahn Navigator is extensible \
-to support each public transport network."
-PRIORITY = "optional"
-SECTION = "opie/applications"
-MAINTAINER = "Dimitri Brukakis"
-LICENSE = "GPL"
-APPNAME = "ubahnnav"
-APPTYPE = "binary"
-APPDESKTOP = "${S}/src/ubahnnav"
-PR = "r2"
-
-SRC_URI = "http://ubahnstation.net/source/ubahnnav-${PV}.tar.gz \
-          file://qmake.patch;patch=1"
-S = "${WORKDIR}/ubahnnav-${PV}"
-
-inherit opie
-
-export OE_QMAKE_LINK="${CXX}"
-EXTRA_QMAKEVARS_POST = "LIBS+=-L${S}"
-
-do_configure_prepend() {
-       find . -name "Makefile"|xargs rm -f
-}
-
-do_install() {
-       oe_libinstall -so libsubwaymap ${D}${palmtopdir}/lib
-        install -d ${D}${palmtopdir}/pics ${D}${palmtopdir}/ubahn/maps
-       touch ${D}${palmtopdir}/ubahn/maps/.empty
-        install -m 0644 src/ubahnnav/images/u-logo.png ${D}${palmtopdir}/pics/ubahnnav.png
-}

diff --git a/packages/ubahnnav/ubahnnav_0.4.0.bb b/packages/ubahnnav/ubahnnav_0.4.1.bb
similarity index 76%
rename from packages/ubahnnav/ubahnnav_0.4.0.bb
rename to packages/ubahnnav/ubahnnav_0.4.1.bb
index 49e46ac..1692468 100644 (file)
--- a/packages/ubahnnav/ubahnnav_0.4.0.bb
+++ b/packages/ubahnnav/ubahnnav_0.4.1.bb
@@ -10,7 +10,7 @@ LICENSE = "GPL"
 APPNAME = "ubahnnav"
 APPTYPE = "binary"
 APPDESKTOP = "${S}/src/ubahnnav"
-PR = "r2"
+PR = "r0"
 
 SRC_URI = "http://ubahnstation.net/source/ubahnnav-${PV}.tar.gz \
           file://qmake.patch;patch=1"
@@ -19,7 +19,7 @@ S = "${WORKDIR}/ubahnnav-${PV}"
 inherit opie
 
 export OE_QMAKE_LINK="${CXX}"
-EXTRA_QMAKEVARS_POST = "LIBS+=-L${S} LIBS-=-lqtopia"
+EXTRA_QMAKEVARS_POST = "INCLUDEPATH+=${S}/src/libsubwaymap LIBS+=-L${S} LIBS-=-lqtopia"
 
 do_configure_prepend() {
        find . -name "Makefile"|xargs rm -f
@@ -27,7 +27,8 @@ do_configure_prepend() {
 
 do_install() {
        oe_libinstall -so libsubwaymap ${D}${palmtopdir}/lib
-        install -d ${D}${palmtopdir}/pics ${D}${palmtopdir}/ubahn/maps
+       install -d ${D}${palmtopdir}/pics
+       install -d ${D}${palmtopdir}/ubahn/maps
        touch ${D}${palmtopdir}/ubahn/maps/.empty
-        install -m 0644 src/ubahnnav/images/u-logo.png ${D}${palmtopdir}/pics/ubahnnav.png
+       install -m 0644 src/ubahnnav/images/u-logo.png ${D}${palmtopdir}/pics/ubahnnav.png
 }