From e084786aed2d73221570ea9f0199a85890ac231f Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Thu, 3 Jan 2008 15:08:58 +0000
Subject: 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

---
 packages/qpegps/files/qpegps.desktop | 3 +--
 packages/qpegps/qpegps.inc           | 8 +++++---
 packages/qpegps/qpegps_0.9.3.1.bb    | 6 ++++++
 packages/qpegps/qpegps_0.9.3.bb      | 1 -
 4 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 packages/qpegps/qpegps_0.9.3.1.bb
 delete mode 100644 packages/qpegps/qpegps_0.9.3.bb

(limited to 'packages/qpegps')

diff --git a/packages/qpegps/files/qpegps.desktop b/packages/qpegps/files/qpegps.desktop
index 16e222b00b..de5a93ccea 100644
--- 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 2e10bf40a6..b763be896d 100644
--- 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
index 0000000000..e43e6a353f
--- /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
index 4cdb945321..0000000000
--- a/packages/qpegps/qpegps_0.9.3.bb
+++ /dev/null
@@ -1 +0,0 @@
-require qpegps.inc
-- 
cgit v1.2.3