Miscellany

gordon@Toshiba3005:~/oe/org.openembedded.dev/packages$ mtn diff gpsdrive
#
# old_revision [5573f77a4a4c46b44cdb19d1416f5997c2d9f430]
#
# delete "packages/gpsdrive/gpsdrive_2.10pre3.bb"
# 
# delete "packages/gpsdrive/gpsdrive_cvs.bb"
# 
# patch "packages/gpsdrive/files/gpsdrive.desktop"
#  from [3ed787c2d437f213fb2d28b7fe9bcc9feac2cfa7]
#    to [15d4ff0590df815e4026e4ed69c07fcbee801862]
# 
# patch "packages/gpsdrive/gpsdrive-pda_2.10pre2.bb"
#  from [29c061374aefcc591a87829d659fc50cdc3acefa]
#    to [7d8445a64a34b472a7285a327853101fd6ce4be8]
# 
# patch "packages/gpsdrive/gpsdrive_2.10pre2.bb"
#  from [29a714e888f2ef1c714628caa9619d49cfc6609b]
#    to [45654d0e7c03d8edde1c51eec731eee66b9e2ca3]
# 
# patch "packages/gpsdrive/gpsdrive_2.10pre4.bb"
#  from [8019316f995c6928f922a1b2412b7393fe8599f3]
#    to [7462e1b0f5678a4e0b8c487aee87a3f87ae78918]
#
============================================================
--- packages/gpsdrive/files/gpsdrive.desktop	3ed787c2d437f213fb2d28b7fe9bcc9feac2cfa7
+++ packages/gpsdrive/files/gpsdrive.desktop	15d4ff0590df815e4026e4ed69c07fcbee801862
@@ -1,9 +1,9 @@ Name=GPSDrive
 [Desktop Entry]
 Name=GPSDrive
-Comment=GPS map software
+Comment=GPS Navigation
 Exec=gpsdrive -p -1
-Terminal=0
+Terminal=false
 Type=Application
+Icon=gpsicon
+Categories=Application;
+StartupNotify=false
-Icon=gpsicon.png
-Categories=Application;Other
-StartupNotify=False
============================================================
--- packages/gpsdrive/gpsdrive-pda_2.10pre2.bb	29c061374aefcc591a87829d659fc50cdc3acefa
+++ packages/gpsdrive/gpsdrive-pda_2.10pre2.bb	7d8445a64a34b472a7285a327853101fd6ce4be8
@@ -1,23 +1,15 @@
-inherit autotools pkgconfig
+require gpsdrive.inc
 
-PR = "r1"
 DESCRIPTION = "GPS navigation/map display software, PDA-optimized version"
 HOMEPAGE = "http://www.gedanken.demon.co.uk/gpsdrive-ipaq/"
-DEPENDS = "virtual/libc gtk+ libpcre gpsd"
-RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd"
-SECTION = "x11"
-PRIORITY = "optional"
-LICENSE = "GPL"
 
-inherit pkgconfig
-
 SRC_URI = "http://www.gedanken.demon.co.uk/gpsdrive-ipaq/gpsdrive-2.10pre2-ipaq-r4.tar.gz \
 	   file://makefile.patch;patch=1 "
 
 S = "${WORKDIR}/gpsdrive-2.10pre2-ipaq"
 
-FILES_${PN} = "${bindir}/gpsdrive ${datadir}/gpsdrive ${datadir}/pixmaps ${datadir}/applications"
-FILES_${PN} += "${datadir}/${PN}"
+#FILES_${PN} = "${bindir}/gpsdrive ${datadir}/gpsdrive ${datadir}/pixmaps ${datadir}/applications"
+#FILES_${PN} += "${datadir}/${PN}"
 
 do_compile () {
 	oe_runmake "CC=${CC}" "LD=${CC}" "STRIP=${STRIP}" all
============================================================
--- packages/gpsdrive/gpsdrive_2.10pre2.bb	29a714e888f2ef1c714628caa9619d49cfc6609b
+++ packages/gpsdrive/gpsdrive_2.10pre2.bb	45654d0e7c03d8edde1c51eec731eee66b9e2ca3
@@ -1,27 +1,6 @@
-inherit autotools pkgconfig
+require gpsdrive.inc
 
-PR = "r1"
-PACKAGES += "gpsdrive-add"
-DESCRIPTION = "GPS navigation/map display software"
-DEPENDS = "virtual/libc gtk+ libpcre gpsd"
-RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd"
-SECTION = "x11"
-PRIORITY = "optional"
-LICENSE = "GPL"
+PR = "r2"
 
 SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \
            file://gpsdrive.desktop"
-
-CFLAGS += "-D_GNU_SOURCE"
-
-FILES_${PN} = "${bindir}/gpsdrive ${bindir}/wpcvt ${bindir}/wpget ${datadir}/pixmaps ${datadir}/applications"
-FILES_${PN} += "${datadir}/${PN}"
-
-FILES_gpsdrive-add = "${libdir}"
-
-EXTRA_OECONF = "--disable-garmin"
-
-do_install_append () {
-        mkdir -p  ${D}${datadir}/applications
-        install -m 0644 ${WORKDIR}/gpsdrive.desktop ${D}${datadir}/applications/gpsdrive.desktop
-}
============================================================
--- packages/gpsdrive/gpsdrive_2.10pre4.bb	8019316f995c6928f922a1b2412b7393fe8599f3
+++ packages/gpsdrive/gpsdrive_2.10pre4.bb	7462e1b0f5678a4e0b8c487aee87a3f87ae78918
@@ -1,21 +1,16 @@
-DESCRIPTION = "GPS navigation/map display software"
-SECTION = "x11"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "virtual/libc gtk+ libpcre gpsd libwww-perl-native mysql"
-RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd libwww-perl"
-PR = "r1"
+require gpsdrive.inc
 
+DEPENDS += "libwww-perl-native libart-lgpl cairo mysql"
+RDEPENDS_${PN} += "libwww-perl"
+
+PR = "r2"
+
 SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \
            file://gpsdrive_2.10pre4.desktop \
            file://gpsdrive-remove-hardcoded-paths.patch;patch=1 \
            file://gpsdrive-ifdef-mapnik.patch;patch=1 \
            file://gpsdrive-2.10pre4-openstreetmap-download.patch;patch=1"
 
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-garmin"
-
 do_install_append () {
         mkdir -p  ${D}${datadir}/applications
         install -m 0644 ${WORKDIR}/gpsdrive_2.10pre4.desktop ${D}${datadir}/applications/gpsdrive.desktop
@@ -36,7 +31,3 @@ FILES_${PN}-doc = "${datadir}/man ${data
 FILES_${PN}-map-icons-other = "${datadir}/map-icons/classic.big ${datadir}/map-icons/japan ${datadir}/map-icons/nickw ${datadir}/map-icons/square.big ${datadir}/map-icons/square.small ${datadir}/map-icons/svg"
 FILES_${PN}-maps = "${datadir}/${PN}/maps ${datadir}/${PN}/map_koord.txt"
 FILES_${PN}-doc = "${datadir}/man ${datadir}/${PN}/Documentation"
-
-CFLAGS += "-D_GNU_SOURCE"
-
-DEFAULT_PREFERENCE = "1"