[oe-commits] org.oe.dev navit: fix packaging, etc.

[xjqian commit]

navit: fix packaging, etc.
* replace hardcoded directory
* package *.la to -dev
* fix .desktop QA
* add SECTION

Author: xjqian at openembedded.org
Branch: org.openembedded.dev
Revision: faddfcf2b3197409fdb5566115c8a819dc24f124
ViewMTN: http://monotone.openembedded.org/revision/info/faddfcf2b3197409fdb5566115c8a819dc24f124
Files:
1
packages/navit/files/navit.desktop
packages/navit/navit.inc
packages/navit/navit_0.0.3.bb
packages/navit/navit_cvs.bb
Diffs:

#
# mt diff -r3ea27c0c881e1f8965e9208c8a3d98d022602838 -rfaddfcf2b3197409fdb5566115c8a819dc24f124
#
# 
# 
# patch "packages/navit/files/navit.desktop"
#  from [abe450116dc6bb7263347dd948f736d0e612f95e]
#    to [4bd9c1fc6d6d79d62fb6649382c319374e729bfb]
# 
# patch "packages/navit/navit.inc"
#  from [4e36ed086e689535bed08a5953f1f330300dc53f]
#    to [28415a06640e4a381ab952253232f3944e7a3ad5]
# 
# patch "packages/navit/navit_0.0.3.bb"
#  from [15b167521e9d10044612c9a9841fd32e13f97363]
#    to [3ad70f521cf586024807037618604fc516e2a10a]
# 
# patch "packages/navit/navit_cvs.bb"
#  from [08dc55cf2a02719d9345a11b1fac91807d8b2e86]
#    to [60cd23b58b422d69f9b6d3fb1d4e070ad166d8eb]
# 
============================================================
--- packages/navit/files/navit.desktop	abe450116dc6bb7263347dd948f736d0e612f95e
+++ packages/navit/files/navit.desktop	4bd9c1fc6d6d79d62fb6649382c319374e729bfb
@@ -1,12 +1,10 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Navit
 Comment=GPS Navigation
 Exec=navit
 Icon=openmoko-terminal
 Terminal=false
 Type=Application
-Categories=GTK;Application;Utilities;
+Categories=GTK;
 MimeType=text/x-vcard;
-SingleInstance=true
 StartupNotify=true
============================================================
--- packages/navit/navit.inc	4e36ed086e689535bed08a5953f1f330300dc53f
+++ packages/navit/navit.inc	28415a06640e4a381ab952253232f3944e7a3ad5
@@ -1,5 +1,6 @@ LICENSE = "GPL"
 DESCRIPTION = "Navit is a car navigation system with routing engine."
 LICENSE = "GPL"
+SECTION = "x11/applications"
 DEPENDS = "glib-2.0 gtk+"
 RRECOMMENDS = "gpsd speechd flite"
 
@@ -10,7 +11,7 @@ FILES_${PN}-dbg += "${libdir}/${PN}/*/.d
 PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
 
 FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
-FILES_${PN}-dev += "${libdir}/${PN}/*/*.so"
+FILES_${PN}-dev += "${libdir}/${PN}/*/*.so ${libdir}/${PN}/*/*.la"
 
 SRC_URI_append = " \
                   file://navit.xml-so.patch;patch=1 \
@@ -19,9 +20,9 @@ do_install_append() {
 	  	 "
 
 do_install_append() {
-        install -d ${D}/usr/share/applications/
-        install -m 0644 ${WORKDIR}/navit.desktop ${D}/usr/share/applications/
+        install -d ${D}${datadir}/applications/
+        install -m 0644 ${WORKDIR}/navit.desktop ${D}${datadir}/applications/
 
-        mv ${D}/usr/bin/navit ${D}/usr/bin/navit.real
-        install -m 0755 ${WORKDIR}/navit.launcher ${D}/usr/bin/navit
+        mv ${D}${bindir}/navit ${D}${bindir}/navit.real
+        install -m 0755 ${WORKDIR}/navit.launcher ${D}${bindir}/navit
 }
============================================================
--- packages/navit/navit_0.0.3.bb	15b167521e9d10044612c9a9841fd32e13f97363
+++ packages/navit/navit_0.0.3.bb	3ad70f521cf586024807037618604fc516e2a10a
@@ -1,5 +1,5 @@ require navit.inc
 require navit.inc
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz"
============================================================
--- packages/navit/navit_cvs.bb	08dc55cf2a02719d9345a11b1fac91807d8b2e86
+++ packages/navit/navit_cvs.bb	60cd23b58b422d69f9b6d3fb1d4e070ad166d8eb
@@ -1,7 +1,7 @@ require navit.inc
 require navit.inc
 
-PV = "0.0.3+cvs${SRCDATE}"
-PR = "r4"
+PV = "0.0.4+cvs${SRCDATE}"
+PR = "r5"
 
 S = "${WORKDIR}/navit"