qpegps: upgrade 0.9.3.1. bump angstrom-preferred

* fix DEPENDS and libqte-mt linking  close #oebug 3955 thanks to bluelightning
* patch 0.9.3.1 Place.* file name bug
* fix .desktop QA issue

diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index 97fed90..82c31cb 100644 (file)
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -1594,7 +1594,7 @@ PREFERRED_VERSION_qpe-inputhelper-applet ?= "1.0.0"
 PREFERRED_VERSION_qpe-libgaim ?= "1.5.0"
 PREFERRED_VERSION_qpealarmclock ?= "1.0.9"
 PREFERRED_VERSION_qpealarmclockapplet ?= "1.0.9"
-PREFERRED_VERSION_qpegps ?= "0.9.3"
+PREFERRED_VERSION_qpegps ?= "0.9.3.1"
 PREFERRED_VERSION_qpenmapfe ?= "1.0.0"
 PREFERRED_VERSION_qpf-arabic ?= "1.0"
 PREFERRED_VERSION_qpf-bitstream-vera ?= "1.10"

diff --git a/packages/qpegps/files/qpegps.desktop b/packages/qpegps/files/qpegps.desktop
index 16e222b..de5a93c 100644 (file)
--- a/packages/qpegps/files/qpegps.desktop
+++ b/packages/qpegps/files/qpegps.desktop
@@ -1,7 +1,6 @@
 [Desktop Entry]
 Comment=Moving Map
 Exec=qpegps
-Icon=qpegps/qpegps.png
+Icon=qpegps
 Type=Application
 Name=qpeGPS
-

diff --git a/packages/qpegps/qpegps.inc b/packages/qpegps/qpegps.inc
index 2e10bf4..b763be8 100644 (file)
--- a/packages/qpegps/qpegps.inc
+++ b/packages/qpegps/qpegps.inc
@@ -4,7 +4,8 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 HOMEPAGE = "http://qpegps.sourceforge.net/"
 
-RRECOMMENDS = "gpsd"
+DEPENDS = "gpsd"
+RDEPENDS = "gpsd"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/qpegps/qpegps_${PV}_src.zip \
            file://qpegps.desktop \
@@ -16,18 +17,19 @@ inherit palmtop
 QMAKE_PROFILES = "qpegps.pro"
 EXTRA_QMAKEVARS_POST = "LIBS=-lqpe LIBS+=-lgps"
 OE_QMAKE_CFLAGS += " -DQWS "
+OE_QMAKE_LIBS_QT = ${QT_LIBRARY}
 
 do_install() {
         install -d ${D}${palmtopdir}/bin \
                   ${D}${palmtopdir}/apps/Applications \
-                  ${D}${palmtopdir}/pics/qpegps \
+                  ${D}${palmtopdir}/pics \
                   ${D}${palmtopdir}/help/html/qpegps_icons \
                   ${D}${palmtopdir}/qpegps/maps \
                   ${D}${palmtopdir}/qpegps/icons \
                   ${D}${palmtopdir}/qpegps/tracks
         install -m 0755 qpegps ${D}${palmtopdir}/bin/
         install -m 0644 ${WORKDIR}/qpegps.desktop ${D}${palmtopdir}/apps/Applications/
-        install -m 0644 ${WORKDIR}/qpegps.png ${D}${palmtopdir}/pics/qpegps/
+        install -m 0644 ${WORKDIR}/qpegps.png ${D}${palmtopdir}/pics/
         install -m 0644 doc/qpegps.html ${D}${palmtopdir}/help/html/
         install -m 0644 doc/qpegps_icons/*.png ${D}${palmtopdir}/help/html/qpegps_icons/
         install -m 0644 icons/*.xpm ${D}${palmtopdir}/qpegps/icons/

diff --git a/packages/qpegps/qpegps_0.9.3.1.bb b/packages/qpegps/qpegps_0.9.3.1.bb
new file mode 100644 (file)
index 0000000..e43e6a3
--- /dev/null
+++ b/packages/qpegps/qpegps_0.9.3.1.bb
@@ -0,0 +1,6 @@
+require qpegps.inc
+
+do_configure_prepend() {
+         mv ${S}/Place.cpp ${S}/place.cpp
+         mv ${S}/Place.h ${S}/place.h
+}

diff --git a/packages/qpegps/qpegps_0.9.3.bb b/packages/qpegps/qpegps_0.9.3.bb
deleted file mode 100644 (file)
index 4cdb945..0000000
--- a/packages/qpegps/qpegps_0.9.3.bb
+++ /dev/null
@@ -1 +0,0 @@
-require qpegps.inc