navit: resolve merging current navit from OE.dev branch

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>

diff --cc recipes/navit/navit.inc
index fdb9813,fa250ff..0a07660
--- 1/recipes/navit/navit.inc
--- 2/recipes/navit/navit.inc
+++ b/recipes/navit/navit.inc
@@@ -19,25 -15,14 +19,25 @@@ FILES_${PN}-dev += "${libdir}/${PN}/*/*
  
  SRC_URI_append = " \
                    file://navit.desktop \
-                   file://navit.launcher \
                    file://navit.png \
                 "
 +SRC_URI_append_shr = "file://navitD.desktop \
 +                      file://navitD.png \
 +                     "
 +
 +DEPENDS_append_shr = " gypsy"
 +RDEPENDS_append_shr = " fsoraw"
  
  do_install_append() {
          install -d ${D}${datadir}/applications/
          install -m 0644 ${WORKDIR}/navit.desktop ${D}${datadir}/applications/
 +        install -m 0644 ${WORKDIR}/navitD.desktop ${D}${datadir}/applications/
 +
          install -d ${D}${datadir}/pixmaps/
          install -m 0644 ${WORKDIR}/navit.png ${D}${datadir}/pixmaps/
 +        install -m 0644 ${WORKDIR}/navitD.png ${D}${datadir}/pixmaps/
  
-         mv ${D}${bindir}/navit ${D}${bindir}/navit.real
-         install -m 0755 ${WORKDIR}/navit.launcher ${D}${bindir}/navit
++      #FIXME: don't install those in the first place, 
++      #FIXME: rather then deleting post-install?
+       rm ${D}${libdir}/${PN}/*/*.la
  }