[oe-commits] org.oe.dev qpegps: upgrade 0.9.3.1. bump angstrom-preferred

[xjqian commit]

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

Author: xjqian at openembedded.org
Branch: org.openembedded.dev
Revision: 40bac439643c75e92f89252f0b5dfe329b2b8119
ViewMTN: http://monotone.openembedded.org/revision/info/40bac439643c75e92f89252f0b5dfe329b2b8119
Files:
1
packages/qpegps/qpegps_0.9.3.bb
packages/qpegps/qpegps_0.9.3.1.bb
conf/distro/include/angstrom-2007-preferred-versions.inc
packages/qpegps/files/qpegps.desktop
packages/qpegps/qpegps.inc
Diffs:

#
# mt diff -r75652b38a37c44ad34823f4fc6e67b212f2d6ec2 -r40bac439643c75e92f89252f0b5dfe329b2b8119
#
# 
# 
# rename "packages/qpegps/qpegps_0.9.3.bb"
#     to "packages/qpegps/qpegps_0.9.3.1.bb"
# 
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
#  from [782e80b0f3b3076866c7a3507276ad9f24f91bc4]
#    to [b63adaffd19f973e76be44bc0544e96ff3e9c602]
# 
# patch "packages/qpegps/files/qpegps.desktop"
#  from [8731bc5f8a74df0ba973c2a98cca70e1a012548d]
#    to [999f00fdc94912b39cda6b2f18139013ad019af7]
# 
# patch "packages/qpegps/qpegps.inc"
#  from [3da7e58c9eb26df021729878d8d0e46ebe5513ff]
#    to [ad06c195bd677200966728bcf93101e47b96eeb8]
# 
# patch "packages/qpegps/qpegps_0.9.3.1.bb"
#  from [5ed209f056be5ae98b7ed0041ffdc771e271b7be]
#    to [94d58e717e493f06eaeb86303f48c0952d98b097]
# 
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc	782e80b0f3b3076866c7a3507276ad9f24f91bc4
+++ conf/distro/include/angstrom-2007-preferred-versions.inc	b63adaffd19f973e76be44bc0544e96ff3e9c602
@@ -1594,7 +1594,7 @@ PREFERRED_VERSION_qpealarmclockapplet ?=
 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"
============================================================
--- packages/qpegps/files/qpegps.desktop	8731bc5f8a74df0ba973c2a98cca70e1a012548d
+++ packages/qpegps/files/qpegps.desktop	999f00fdc94912b39cda6b2f18139013ad019af7
@@ -1,7 +1,6 @@ Exec=qpegps
 [Desktop Entry]
 Comment=Moving Map
 Exec=qpegps
-Icon=qpegps/qpegps.png
+Icon=qpegps
 Type=Application
 Name=qpeGPS
-
============================================================
--- packages/qpegps/qpegps.inc	3da7e58c9eb26df021729878d8d0e46ebe5513ff
+++ packages/qpegps/qpegps.inc	ad06c195bd677200966728bcf93101e47b96eeb8
@@ -1,10 +1,11 @@ HOMEPAGE = "http://qpegps.sourceforge.ne
 DESCRIPTION = "A GPS navigation application for the Opie environment"
 SECTION = "opie/applications"
 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 @@ OE_QMAKE_CFLAGS += " -DQWS "
 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/
============================================================
--- packages/qpegps/qpegps_0.9.3.bb	5ed209f056be5ae98b7ed0041ffdc771e271b7be
+++ packages/qpegps/qpegps_0.9.3.1.bb	94d58e717e493f06eaeb86303f48c0952d98b097
@@ -1 +1,6 @@ require qpegps.inc
 require qpegps.inc
+
+do_configure_prepend() {
+         mv ${S}/Place.cpp ${S}/place.cpp
+         mv ${S}/Place.h ${S}/place.h
+}