From: Gilles Filippini Date: Wed, 9 Sep 2009 21:06:49 +0000 (+0200) Subject: Update patches to new upstream snapshot. X-Git-Url: http://git.maemo.org/git/?a=commitdiff_plain;h=2b28b760472ece1083615996c8f4551e8e3fcf7f;p=navit-package Update patches to new upstream snapshot. --- diff --git a/debian/patches/remove-ezxml b/debian/patches/remove-ezxml index 9ae1099..11c6d51 100644 --- a/debian/patches/remove-ezxml +++ b/debian/patches/remove-ezxml @@ -1,31 +1,13 @@ Handles the removal of embedded ezxml from upstream-svn. Index: navit/configure.in =================================================================== ---- navit.orig/configure.in 2009-09-01 23:15:56.000000000 +0200 -+++ navit/configure.in 2009-09-01 23:16:05.000000000 +0200 -@@ -807,7 +807,6 @@ +--- navit.orig/configure.in 2009-09-09 22:54:20.000000000 +0200 ++++ navit/configure.in 2009-09-09 22:55:16.000000000 +0200 +@@ -819,7 +819,6 @@ navit/speech/cmdline/Makefile navit/speech/speech_dispatcher/Makefile navit/support/Makefile -navit/support/ezxml/Makefile + navit/support/libpng/Makefile navit/support/win32/Makefile navit/support/wordexp/Makefile - navit/support/zlib/Makefile -Index: navit/navit/support/Makefile.am -=================================================================== ---- navit.orig/navit/support/Makefile.am 2009-09-01 23:14:58.000000000 +0200 -+++ navit/navit/support/Makefile.am 2009-09-01 23:16:05.000000000 +0200 -@@ -1,7 +1,4 @@ - SUBDIRS= --if SUPPORT_EZXML -- SUBDIRS+=ezxml --endif - if SUPPORT_WORDEXP - SUBDIRS+=wordexp - endif -@@ -11,4 +8,4 @@ - if SUPPORT_ZLIB - SUBDIRS+=zlib - endif --DIST_SUBDIRS=ezxml wordexp win32 zlib -+DIST_SUBDIRS=wordexp win32 zlib diff --git a/debian/patches/remove-glib b/debian/patches/remove-glib index 532d1bf..2607b54 100644 --- a/debian/patches/remove-glib +++ b/debian/patches/remove-glib @@ -1,33 +1,13 @@ Handles the removal of embedded glib from upstream-svn. Index: navit/configure.in =================================================================== ---- navit.orig/configure.in 2009-09-01 23:13:54.000000000 +0200 -+++ navit/configure.in 2009-09-01 23:14:37.000000000 +0200 -@@ -810,7 +810,6 @@ +--- navit.orig/configure.in 2009-09-09 22:49:50.000000000 +0200 ++++ navit/configure.in 2009-09-09 22:51:23.000000000 +0200 +@@ -822,7 +822,6 @@ navit/speech/speech_dispatcher/Makefile navit/support/Makefile navit/support/ezxml/Makefile -navit/support/glib/Makefile navit/support/libc/Makefile + navit/support/libpng/Makefile navit/support/win32/Makefile - navit/support/wordexp/Makefile -Index: navit/navit/support/Makefile.am -=================================================================== ---- navit.orig/navit/support/Makefile.am 2009-06-28 22:00:52.000000000 +0200 -+++ navit/navit/support/Makefile.am 2009-09-01 23:14:37.000000000 +0200 -@@ -2,9 +2,6 @@ - if SUPPORT_EZXML - SUBDIRS+=ezxml - endif --if SUPPORT_GLIB -- SUBDIRS+=glib --endif - if SUPPORT_WORDEXP - SUBDIRS+=wordexp - endif -@@ -17,4 +14,4 @@ - if SUPPORT_LIBC - SUBDIRS+=libc - endif --DIST_SUBDIRS=ezxml glib wordexp win32 zlib libc -+DIST_SUBDIRS=ezxml wordexp win32 zlib libc diff --git a/debian/patches/remove-libmdb.diff b/debian/patches/remove-libmdb.diff index 58b908b..1a728e5 100644 --- a/debian/patches/remove-libmdb.diff +++ b/debian/patches/remove-libmdb.diff @@ -1,8 +1,8 @@ iHandles the removal of embedded mdbtools from upstream-svn. Index: navit/navit/map/poi_geodownload/Makefile.am =================================================================== ---- navit.orig/navit/map/poi_geodownload/Makefile.am 2009-06-28 22:00:51.000000000 +0200 -+++ navit/navit/map/poi_geodownload/Makefile.am 2009-09-01 23:15:56.000000000 +0200 +--- navit.orig/navit/map/poi_geodownload/Makefile.am 2009-09-01 23:18:55.000000000 +0200 ++++ navit/navit/map/poi_geodownload/Makefile.am 2009-09-09 22:54:20.000000000 +0200 @@ -1,7 +1,6 @@ -SUBDIRS=libmdb include $(top_srcdir)/Makefile.inc @@ -15,9 +15,9 @@ Index: navit/navit/map/poi_geodownload/Makefile.am libmap_poi_geodownload_la_LDFLAGS = -module -avoid-version Index: navit/configure.in =================================================================== ---- navit.orig/configure.in 2009-09-01 23:14:58.000000000 +0200 -+++ navit/configure.in 2009-09-01 23:15:56.000000000 +0200 -@@ -784,8 +784,6 @@ +--- navit.orig/configure.in 2009-09-09 22:53:47.000000000 +0200 ++++ navit/configure.in 2009-09-09 22:54:20.000000000 +0200 +@@ -796,8 +796,6 @@ navit/map/binfile/Makefile navit/map/garmin/Makefile navit/map/poi_geodownload/Makefile diff --git a/debian/patches/remove-mini-libc b/debian/patches/remove-mini-libc index 11ddffd..ae60913 100644 --- a/debian/patches/remove-mini-libc +++ b/debian/patches/remove-mini-libc @@ -1,26 +1,13 @@ Handles the removal of the embedded mini-libc from upstream-svn. Index: navit/configure.in =================================================================== ---- navit.orig/configure.in 2009-09-01 23:14:37.000000000 +0200 -+++ navit/configure.in 2009-09-01 23:14:58.000000000 +0200 -@@ -810,7 +810,6 @@ +--- navit.orig/configure.in 2009-09-09 22:51:23.000000000 +0200 ++++ navit/configure.in 2009-09-09 22:53:47.000000000 +0200 +@@ -822,7 +822,6 @@ navit/speech/speech_dispatcher/Makefile navit/support/Makefile navit/support/ezxml/Makefile -navit/support/libc/Makefile + navit/support/libpng/Makefile navit/support/win32/Makefile navit/support/wordexp/Makefile - navit/support/zlib/Makefile -Index: navit/navit/support/Makefile.am -=================================================================== ---- navit.orig/navit/support/Makefile.am 2009-09-01 23:14:37.000000000 +0200 -+++ navit/navit/support/Makefile.am 2009-09-01 23:14:58.000000000 +0200 -@@ -11,7 +11,4 @@ - if SUPPORT_ZLIB - SUBDIRS+=zlib - endif --if SUPPORT_LIBC -- SUBDIRS+=libc --endif --DIST_SUBDIRS=ezxml wordexp win32 zlib libc -+DIST_SUBDIRS=ezxml wordexp win32 zlib diff --git a/debian/patches/remove-win32 b/debian/patches/remove-win32 index 05a3b2a..9639b9a 100644 --- a/debian/patches/remove-win32 +++ b/debian/patches/remove-win32 @@ -1,9 +1,9 @@ Handle the removal of win32 specific parts from upstream-svn. Index: navit/configure.in =================================================================== ---- navit.orig/configure.in 2009-09-01 23:16:09.000000000 +0200 -+++ navit/configure.in 2009-09-01 23:18:01.000000000 +0200 -@@ -795,11 +795,9 @@ +--- navit.orig/configure.in 2009-09-09 22:56:08.000000000 +0200 ++++ navit/configure.in 2009-09-09 22:57:34.000000000 +0200 +@@ -807,11 +807,9 @@ navit/graphics/null/Makefile navit/graphics/sdl/Makefile navit/graphics/qt_qpainter/Makefile @@ -15,31 +15,18 @@ Index: navit/configure.in navit/osd/Makefile navit/osd/core/Makefile navit/speech/Makefile -@@ -807,7 +805,6 @@ - navit/speech/cmdline/Makefile +@@ -820,7 +818,6 @@ navit/speech/speech_dispatcher/Makefile navit/support/Makefile + navit/support/libpng/Makefile -navit/support/win32/Makefile navit/support/wordexp/Makefile navit/vehicle/Makefile navit/vehicle/android/Makefile -Index: navit/navit/support/Makefile.am -=================================================================== ---- navit.orig/navit/support/Makefile.am 2009-09-01 23:16:09.000000000 +0200 -+++ navit/navit/support/Makefile.am 2009-09-01 23:17:11.000000000 +0200 -@@ -2,7 +2,4 @@ - if SUPPORT_WORDEXP - SUBDIRS+=wordexp - endif --if SUPPORT_WIN32 -- SUBDIRS+=win32 --endif --DIST_SUBDIRS=wordexp win32 -+DIST_SUBDIRS=wordexp Index: navit/navit/gui/Makefile.am =================================================================== ---- navit.orig/navit/gui/Makefile.am 2009-06-28 22:00:50.000000000 +0200 -+++ navit/navit/gui/Makefile.am 2009-09-01 23:17:11.000000000 +0200 +--- navit.orig/navit/gui/Makefile.am 2009-09-01 23:18:54.000000000 +0200 ++++ navit/navit/gui/Makefile.am 2009-09-09 22:57:12.000000000 +0200 @@ -5,6 +5,3 @@ if GUI_GTK SUBDIRS += gtk @@ -49,8 +36,8 @@ Index: navit/navit/gui/Makefile.am -endif Index: navit/navit/graphics/Makefile.am =================================================================== ---- navit.orig/navit/graphics/Makefile.am 2009-09-01 22:38:03.000000000 +0200 -+++ navit/navit/graphics/Makefile.am 2009-09-01 23:17:11.000000000 +0200 +--- navit.orig/navit/graphics/Makefile.am 2009-09-01 23:18:54.000000000 +0200 ++++ navit/navit/graphics/Makefile.am 2009-09-09 22:57:12.000000000 +0200 @@ -14,9 +14,6 @@ if USE_GRAPHICS_SDL SUBDIRS+=sdl diff --git a/debian/patches/remove-wordexp b/debian/patches/remove-wordexp index 207ebe1..346b7f9 100644 --- a/debian/patches/remove-wordexp +++ b/debian/patches/remove-wordexp @@ -1,24 +1,13 @@ Handles the removal of embedded wordexp from upstream-svn. Index: navit/configure.in =================================================================== ---- navit.orig/configure.in 2009-09-01 23:18:01.000000000 +0200 -+++ navit/configure.in 2009-09-01 23:18:38.000000000 +0200 -@@ -805,7 +805,6 @@ - navit/speech/cmdline/Makefile +--- navit.orig/configure.in 2009-09-09 22:57:34.000000000 +0200 ++++ navit/configure.in 2009-09-09 22:58:28.000000000 +0200 +@@ -818,7 +818,6 @@ navit/speech/speech_dispatcher/Makefile navit/support/Makefile + navit/support/libpng/Makefile -navit/support/wordexp/Makefile navit/vehicle/Makefile navit/vehicle/android/Makefile navit/vehicle/file/Makefile -Index: navit/navit/support/Makefile.am -=================================================================== ---- navit.orig/navit/support/Makefile.am 2009-09-01 23:17:11.000000000 +0200 -+++ navit/navit/support/Makefile.am 2009-09-01 23:18:38.000000000 +0200 -@@ -1,5 +1,2 @@ - SUBDIRS= --if SUPPORT_WORDEXP -- SUBDIRS+=wordexp --endif --DIST_SUBDIRS=wordexp -+DIST_SUBDIRS= diff --git a/debian/patches/remove-zlib b/debian/patches/remove-zlib index 152af16..843d4f1 100644 --- a/debian/patches/remove-zlib +++ b/debian/patches/remove-zlib @@ -1,26 +1,13 @@ Handles the removal of embedded zlib from upstream-svn. Index: navit/configure.in =================================================================== ---- navit.orig/configure.in 2009-09-01 23:16:05.000000000 +0200 -+++ navit/configure.in 2009-09-01 23:16:09.000000000 +0200 -@@ -809,7 +809,6 @@ - navit/support/Makefile +--- navit.orig/configure.in 2009-09-09 22:55:16.000000000 +0200 ++++ navit/configure.in 2009-09-09 22:56:08.000000000 +0200 +@@ -822,7 +822,6 @@ + navit/support/libpng/Makefile navit/support/win32/Makefile navit/support/wordexp/Makefile -navit/support/zlib/Makefile navit/vehicle/Makefile navit/vehicle/android/Makefile navit/vehicle/file/Makefile -Index: navit/navit/support/Makefile.am -=================================================================== ---- navit.orig/navit/support/Makefile.am 2009-09-01 23:16:05.000000000 +0200 -+++ navit/navit/support/Makefile.am 2009-09-01 23:16:09.000000000 +0200 -@@ -5,7 +5,4 @@ - if SUPPORT_WIN32 - SUBDIRS+=win32 - endif --if SUPPORT_ZLIB -- SUBDIRS+=zlib --endif --DIST_SUBDIRS=wordexp win32 zlib -+DIST_SUBDIRS=wordexp win32