[oe-commits] Martin Jansa : navit: drop navit.png, navit.service files

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: edd701977811c72b04e692040456318b6097d52f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=edd701977811c72b04e692040456318b6097d52f

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Nov  4 22:09:48 2009 +0100

navit: drop navit.png, navit.service files

* We can use icon and service file from sources
* Old recipes should be addapted to this change or better dropped

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 recipes/navit/navit.inc |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/recipes/navit/navit.inc b/recipes/navit/navit.inc
index 5801a45..6aa9121 100644
--- a/recipes/navit/navit.inc
+++ b/recipes/navit/navit.inc
@@ -10,15 +10,13 @@ EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap -
 
 PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
 
-FILES_${PN} += "${libdir}/${PN}/*/*.so"
+FILES_${PN} += "${libdir}/${PN}/*/*.so ${datadir}/dbus-1/services/ ${datadir}/icons/*/*/apps/navit.png"
 FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
 FILES_${PN}-dev += "${libdir}/${PN}/*/*.la"
 
 SRC_URI_append = " \
                   file://navit.desktop \
                   file://navit.launcher \
-                  file://navit.png \
-                  file://navit.service \
 	  	 "
 SRC_URI_append_shr = "file://use-fso-raw.patch;patch=1"
 #                      file://fr-default-config.patch;patch=1"
@@ -29,10 +27,6 @@ RDEPENDS_shr += "fsoraw"
 do_install_append() {
         install -d ${D}${datadir}/applications/
         install -m 0644 ${WORKDIR}/navit.desktop ${D}${datadir}/applications/
-        install -d ${D}${datadir}/pixmaps/
-        install -m 0644 ${WORKDIR}/navit.png ${D}${datadir}/pixmaps/
-        install -d ${D}${datadir}/dbus-1/services/
-        install -m 0644 ${WORKDIR}/navit.service ${D}${datadir}/dbus-1/services/
 
         mv ${D}${bindir}/navit ${D}${bindir}/navit.real
         install -m 0755 ${WORKDIR}/navit.launcher ${D}${bindir}/navit