diff options
| author | Ovidiu Sas <sip.nslu@gmail.com> | 2008-02-02 02:05:40 +0000 |
|---|---|---|
| committer | Ovidiu Sas <sip.nslu@gmail.com> | 2008-02-02 02:05:40 +0000 |
| commit | c63e9d13cb35a08fe503e53883f75460eacbd040 (patch) | |
| tree | 55565fdaac0b72c9154b5c6d89508e8b4c1ef0b7 /packages/navit | |
| parent | fb8179540d23ef20ad0c1b2095a4775427070958 (diff) | |
| parent | 86730fc413832d757ebb1e3d74ca122eba7fdbd4 (diff) | |
merge of '8bc0e0a5967ae8fccb6d56b0d9f5a3a9bf3d7dff'
and 'edd46f6b477e2a693c84c2ba999b868f23a733f0'
Diffstat (limited to 'packages/navit')
| -rw-r--r-- | packages/navit/files/navit.desktop | 4 | ||||
| -rw-r--r-- | packages/navit/navit.inc | 11 | ||||
| -rw-r--r-- | packages/navit/navit_0.0.3.bb | 2 | ||||
| -rw-r--r-- | packages/navit/navit_cvs.bb | 4 |
4 files changed, 10 insertions, 11 deletions
diff --git a/packages/navit/files/navit.desktop b/packages/navit/files/navit.desktop index 52aae31fce..4d7fda0e35 100644 --- a/packages/navit/files/navit.desktop +++ b/packages/navit/files/navit.desktop @@ -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 diff --git a/packages/navit/navit.inc b/packages/navit/navit.inc index 06e3a72664..23e3f9b23d 100644 --- a/packages/navit/navit.inc +++ b/packages/navit/navit.inc @@ -1,5 +1,6 @@ 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 @@ EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap - 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 @@ SRC_URI_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 } diff --git a/packages/navit/navit_0.0.3.bb b/packages/navit/navit_0.0.3.bb index a926528faf..6688768b88 100644 --- a/packages/navit/navit_0.0.3.bb +++ b/packages/navit/navit_0.0.3.bb @@ -1,5 +1,5 @@ require navit.inc -PR = "r4" +PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz" diff --git a/packages/navit/navit_cvs.bb b/packages/navit/navit_cvs.bb index 014e7d3a53..f548c192df 100644 --- a/packages/navit/navit_cvs.bb +++ b/packages/navit/navit_cvs.bb @@ -1,7 +1,7 @@ require navit.inc -PV = "0.0.3+cvs${SRCDATE}" -PR = "r4" +PV = "0.0.4+cvs${SRCDATE}" +PR = "r5" S = "${WORKDIR}/navit" |