merge of '63c7ad87655c2781ad8b9c81af430596f48a24a6'

     and 'bc63a4fa471a2388437163476a7cb1cf8179bb23'

7 files changed, 15 insertions, 51 deletions

diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index b1ccf23a7c..156b5b21a3 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -1305,7 +1305,7 @@ PREFERRED_VERSION_nano ?= "2.0.6"
 PREFERRED_VERSION_nasm-native ?= "0.98.38"
 PREFERRED_VERSION_nautilus ?= "2.12.2"
 PREFERRED_VERSION_nautilus-cd-burner ?= "2.8.5"
-PREFERRED_VERSION_navit ?= "0.0.1"
+PREFERRED_VERSION_navit ?= "0.0.3"
 PREFERRED_VERSION_nbd ?= "2.8.7"
 PREFERRED_VERSION_ncftp ?= "3.2.0"
 PREFERRED_VERSION_ncmpc ?= "0.11.1"
diff --git a/packages/navit/files/compile-fix.patch b/packages/navit/files/compile-fix.patch
deleted file mode 100644
index 86274d8aa8..0000000000
--- a/packages/navit/files/compile-fix.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -Naur navit-0.0.1.old/src/fib-1.1/Makefile.am navit-0.0.1/src/fib-1.1/Makefile.am
---- navit-0.0.1.old/src/fib-1.1/Makefile.am	2007-07-05 19:16:20.000000000 +0200
-+++ navit-0.0.1/src/fib-1.1/Makefile.am	2007-09-18 00:48:08.000000000 +0200
-@@ -1,4 +1,3 @@
- noinst_LTLIBRARIES = libfib.la
- libfib_la_SOURCES = fib.c fib.h fibpriv.h
--libfib_la_LDFLAGS = -static
- EXTRA_DIST=README configure.in fh_extractmin.3 fh_makeheap.3 fh_makekeyheap.3 fibtest.c fibtest2.c tt.c use.c
diff --git a/packages/navit/navit.inc b/packages/navit/navit.inc
index 1d68027e17..06e3a72664 100644
--- a/packages/navit/navit.inc
+++ b/packages/navit/navit.inc
@@ -5,21 +5,23 @@ RRECOMMENDS = "gpsd speechd flite"
 
 inherit autotools
 
+EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned"
+
 PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
 
 FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
 FILES_${PN}-dev += "${libdir}/${PN}/*/*.so"
 
 SRC_URI_append = " \
-	    	  file://navit.launcher \
+                  file://navit.xml-so.patch;patch=1 \
+                  file://navit.desktop \
+                  file://navit.launcher \
 	  	 "
 
 do_install_append() {
-	install -d ${D}/usr/share/applications/
-	
-	install -m 0644 ${WORKDIR}/navit.desktop ${D}/usr/share/applications/
-	
-	mv ${D}/usr/bin/navit ${D}/usr/bin/navit.real
-	
-	install -m 0755 ${WORKDIR}/navit.launcher ${D}/usr/bin/navit
+        install -d ${D}/usr/share/applications/
+        install -m 0644 ${WORKDIR}/navit.desktop ${D}/usr/share/applications/
+
+        mv ${D}/usr/bin/navit ${D}/usr/bin/navit.real
+        install -m 0755 ${WORKDIR}/navit.launcher ${D}/usr/bin/navit
 }
diff --git a/packages/navit/navit_0.0.1.bb b/packages/navit/navit_0.0.1.bb
deleted file mode 100644
index f96a04ec16..0000000000
--- a/packages/navit/navit_0.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require navit.inc
-
-PR = "r3"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz \
-           file://compile-fix.patch;patch=1"
-
-EXTRA_OECONF = "--disable-gui-sdl --disable-binding-python --enable-avoid-unaligned --enable-avoid-float"
diff --git a/packages/navit/navit_0.0.2.bb b/packages/navit/navit_0.0.2.bb
deleted file mode 100644
index 794f901db5..0000000000
--- a/packages/navit/navit_0.0.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require navit.inc
-
-PR = "r2"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz" 
-
-EXTRA_OECONF = "--disable-gui-sdl --disable-binding-python --disable-samplemap --enable-avoid-unaligned --enable-avoid-float"
diff --git a/packages/navit/navit_0.0.3.bb b/packages/navit/navit_0.0.3.bb
index 7fdb491882..a926528faf 100644
--- a/packages/navit/navit_0.0.3.bb
+++ b/packages/navit/navit_0.0.3.bb
@@ -1,16 +1,5 @@
 require navit.inc
 
-PR = "r3"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz \
-	   file://navit.xml-so.patch;patch=1 \
-	   file://navit.desktop"
-
-EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned"
-
-do_install_append() {
-	install -d ${D}/usr/share/applications/
-	
-	install -m 0644 ${WORKDIR}/navit.desktop ${D}/usr/share/applications/
-}
+PR = "r4"
 
+SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz"
diff --git a/packages/navit/navit_cvs.bb b/packages/navit/navit_cvs.bb
index 0f9583324c..014e7d3a53 100644
--- a/packages/navit/navit_cvs.bb
+++ b/packages/navit/navit_cvs.bb
@@ -1,15 +1,11 @@
 require navit.inc
 
 PV = "0.0.3+cvs${SRCDATE}"
-PR = "r3"
+PR = "r4"
 
 S = "${WORKDIR}/navit"
 
-SRC_URI = "cvs://anonymous@navit.cvs.sourceforge.net/cvsroot/navit;module=navit \
-           file://navit.xml-so.patch;patch=1 \
-	   file://navit.desktop"
-
-EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned"
+SRC_URI = "cvs://anonymous@navit.cvs.sourceforge.net/cvsroot/navit;module=navit"
 
 EXTRA_AUTORECONF = " -I m4"