Refresh patches.

diff --git a/debian/patches/remove-ezxml b/debian/patches/remove-ezxml
index 741bf4e..f302162 100644 (file)
--- a/debian/patches/remove-ezxml
+++ b/debian/patches/remove-ezxml
@@ -1,9 +1,9 @@
 Handles the removal of embedded ezxml from upstream-svn.
 Index: navit/configure.in
 ===================================================================
---- navit.orig/configure.in    2009-03-16 22:17:47.000000000 +0100
-+++ navit/configure.in 2009-03-16 22:17:50.000000000 +0100
-@@ -737,7 +737,6 @@
+--- navit.orig/configure.in    2009-03-30 17:00:07.000000000 +0200
++++ navit/configure.in 2009-03-30 17:00:11.000000000 +0200
+@@ -746,7 +746,6 @@
  navit/speech/cmdline/Makefile
  navit/speech/speech_dispatcher/Makefile
  navit/support/Makefile
@@ -13,8 +13,8 @@ Index: navit/configure.in
  navit/support/zlib/Makefile
 Index: navit/navit/support/Makefile.am
 ===================================================================
---- navit.orig/navit/support/Makefile.am       2009-03-16 22:17:43.000000000 +0100
-+++ navit/navit/support/Makefile.am    2009-03-16 22:17:50.000000000 +0100
+--- navit.orig/navit/support/Makefile.am       2009-03-30 17:00:02.000000000 +0200
++++ navit/navit/support/Makefile.am    2009-03-30 17:00:11.000000000 +0200
 @@ -1,7 +1,4 @@
  SUBDIRS=
 -if SUPPORT_EZXML

diff --git a/debian/patches/remove-glib b/debian/patches/remove-glib
index 5785a97..2343cdd 100644 (file)
--- a/debian/patches/remove-glib
+++ b/debian/patches/remove-glib
@@ -1,9 +1,9 @@
 Handles the removal of embedded glib from upstream-svn.
 Index: navit/configure.in
 ===================================================================
---- navit.orig/configure.in    2009-03-16 22:17:28.000000000 +0100
-+++ navit/configure.in 2009-03-16 22:17:37.000000000 +0100
-@@ -740,7 +740,6 @@
+--- navit.orig/configure.in    2009-03-30 16:59:44.000000000 +0200
++++ navit/configure.in 2009-03-30 16:59:55.000000000 +0200
+@@ -749,7 +749,6 @@
  navit/speech/speech_dispatcher/Makefile
  navit/support/Makefile
  navit/support/ezxml/Makefile
@@ -13,8 +13,8 @@ Index: navit/configure.in
  navit/support/wordexp/Makefile
 Index: navit/navit/support/Makefile.am
 ===================================================================
---- navit.orig/navit/support/Makefile.am       2009-03-12 22:30:05.000000000 +0100
-+++ navit/navit/support/Makefile.am    2009-03-16 22:17:37.000000000 +0100
+--- navit.orig/navit/support/Makefile.am       2009-03-19 22:01:57.000000000 +0100
++++ navit/navit/support/Makefile.am    2009-03-30 16:59:55.000000000 +0200
 @@ -2,9 +2,6 @@
  if SUPPORT_EZXML
    SUBDIRS+=ezxml

diff --git a/debian/patches/remove-libmdb.diff b/debian/patches/remove-libmdb.diff
index 6fd2c50..6dc53f9 100644 (file)
--- 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-03-12 22:30:05.000000000 +0100
-+++ navit/navit/map/poi_geodownload/Makefile.am        2009-03-16 22:17:47.000000000 +0100
+--- navit.orig/navit/map/poi_geodownload/Makefile.am   2009-03-19 22:01:57.000000000 +0100
++++ navit/navit/map/poi_geodownload/Makefile.am        2009-03-30 17:00:07.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
 Index: navit/configure.in
 ===================================================================
---- navit.orig/configure.in    2009-03-16 22:17:43.000000000 +0100
-+++ navit/configure.in 2009-03-16 22:17:47.000000000 +0100
-@@ -716,8 +716,6 @@
+--- navit.orig/configure.in    2009-03-30 17:00:02.000000000 +0200
++++ navit/configure.in 2009-03-30 17:00:07.000000000 +0200
+@@ -725,8 +725,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 648e26f..edc4260 100644 (file)
--- a/debian/patches/remove-mini-libc
+++ b/debian/patches/remove-mini-libc
@@ -1,9 +1,9 @@
 Handles the removal of the embedded mini-libc from upstream-svn.
 Index: navit/configure.in
 ===================================================================
---- navit.orig/configure.in    2009-03-16 22:17:37.000000000 +0100
-+++ navit/configure.in 2009-03-16 22:17:43.000000000 +0100
-@@ -740,7 +740,6 @@
+--- navit.orig/configure.in    2009-03-30 16:59:55.000000000 +0200
++++ navit/configure.in 2009-03-30 17:00:02.000000000 +0200
+@@ -749,7 +749,6 @@
  navit/speech/speech_dispatcher/Makefile
  navit/support/Makefile
  navit/support/ezxml/Makefile
@@ -13,8 +13,8 @@ Index: navit/configure.in
  navit/support/zlib/Makefile
 Index: navit/navit/support/Makefile.am
 ===================================================================
---- navit.orig/navit/support/Makefile.am       2009-03-16 22:17:37.000000000 +0100
-+++ navit/navit/support/Makefile.am    2009-03-16 22:17:43.000000000 +0100
+--- navit.orig/navit/support/Makefile.am       2009-03-30 16:59:55.000000000 +0200
++++ navit/navit/support/Makefile.am    2009-03-30 17:00:02.000000000 +0200
 @@ -11,7 +11,4 @@
  if SUPPORT_ZLIB
    SUBDIRS+=zlib

diff --git a/debian/patches/remove-ttf-liberation b/debian/patches/remove-ttf-liberation
index 9c75bc1..18cf44f 100644 (file)
--- a/debian/patches/remove-ttf-liberation
+++ b/debian/patches/remove-ttf-liberation
@@ -1,9 +1,9 @@
 Handles the removal of embedded ttf-liberation from upstream-svn.
 Index: navit/configure.in
 ===================================================================
---- navit.orig/configure.in    2009-03-14 09:09:44.000000000 +0100
-+++ navit/configure.in 2009-03-16 22:17:28.000000000 +0100
-@@ -721,7 +721,6 @@
+--- navit.orig/configure.in    2009-03-30 16:58:45.000000000 +0200
++++ navit/configure.in 2009-03-30 16:59:44.000000000 +0200
+@@ -730,7 +730,6 @@
  navit/fib-1.1/Makefile
  navit/font/Makefile
  navit/font/freetype/Makefile
@@ -13,8 +13,8 @@ Index: navit/configure.in
  navit/graphics/gtk_drawing_area/Makefile
 Index: navit/navit/Makefile.am
 ===================================================================
---- navit.orig/navit/Makefile.am       2009-03-16 22:09:29.000000000 +0100
-+++ navit/navit/Makefile.am    2009-03-16 22:17:28.000000000 +0100
+--- navit.orig/navit/Makefile.am       2009-03-22 20:33:48.000000000 +0100
++++ navit/navit/Makefile.am    2009-03-30 16:59:44.000000000 +0200
 @@ -1,14 +1,10 @@
  include $(top_srcdir)/Makefile.inc
 -DIST_SUBDIRS=binding map fib-1.1 font fonts gui graphics osd speech support vehicle xpm maps
@@ -29,5 +29,5 @@ Index: navit/navit/Makefile.am
 -endif
 -
  AM_CPPFLAGS = -I$(top_srcdir)/navit/fib-1.1 @NAVIT_CFLAGS@ @ZLIB_CFLAGS@ -DPREFIX=\"@prefix@\" -DLIBDIR=\"@libdir@\" -DMODULE=navit
- BUILT_SOURCES = version.h
+ BUILT_SOURCES = version.h navit_config.h
  if BUILD_SAMPLEMAP

diff --git a/debian/patches/remove-win32 b/debian/patches/remove-win32
index 28afd02..b6321fe 100644 (file)
--- 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-03-16 22:17:53.000000000 +0100
-+++ navit/configure.in 2009-03-16 22:17:56.000000000 +0100
-@@ -726,18 +726,15 @@
+--- navit.orig/configure.in    2009-03-30 17:00:14.000000000 +0200
++++ navit/configure.in 2009-03-30 17:00:19.000000000 +0200
+@@ -735,18 +735,15 @@
  navit/graphics/null/Makefile
  navit/graphics/sdl/Makefile
  navit/graphics/qt_qpainter/Makefile
@@ -24,8 +24,8 @@ Index: navit/configure.in
  navit/vehicle/file/Makefile
 Index: navit/navit/support/Makefile.am
 ===================================================================
---- navit.orig/navit/support/Makefile.am       2009-03-16 22:17:53.000000000 +0100
-+++ navit/navit/support/Makefile.am    2009-03-16 22:17:56.000000000 +0100
+--- navit.orig/navit/support/Makefile.am       2009-03-30 17:00:14.000000000 +0200
++++ navit/navit/support/Makefile.am    2009-03-30 17:00:19.000000000 +0200
 @@ -2,7 +2,4 @@
  if SUPPORT_WORDEXP
    SUBDIRS+=wordexp
@@ -37,8 +37,8 @@ Index: navit/navit/support/Makefile.am
 +DIST_SUBDIRS=wordexp
 Index: navit/navit/gui/Makefile.am
 ===================================================================
---- navit.orig/navit/gui/Makefile.am   2009-03-12 22:30:05.000000000 +0100
-+++ navit/navit/gui/Makefile.am        2009-03-16 22:17:56.000000000 +0100
+--- navit.orig/navit/gui/Makefile.am   2009-03-19 22:01:57.000000000 +0100
++++ navit/navit/gui/Makefile.am        2009-03-30 17:00:19.000000000 +0200
 @@ -5,6 +5,3 @@
  if GUI_GTK
    SUBDIRS += gtk
@@ -48,8 +48,8 @@ Index: navit/navit/gui/Makefile.am
 -endif
 Index: navit/navit/graphics/Makefile.am
 ===================================================================
---- navit.orig/navit/graphics/Makefile.am      2009-03-12 22:30:05.000000000 +0100
-+++ navit/navit/graphics/Makefile.am   2009-03-16 22:17:56.000000000 +0100
+--- navit.orig/navit/graphics/Makefile.am      2009-03-19 22:01:57.000000000 +0100
++++ navit/navit/graphics/Makefile.am   2009-03-30 17:00:19.000000000 +0200
 @@ -11,9 +11,6 @@
  if USE_GRAPHICS_SDL
    SUBDIRS+=sdl

diff --git a/debian/patches/remove-wordexp b/debian/patches/remove-wordexp
index 4859342..60f0489 100644 (file)
--- a/debian/patches/remove-wordexp
+++ b/debian/patches/remove-wordexp
@@ -1,9 +1,9 @@
 Handles the removal of embedded wordexp from upstream-svn.
 Index: navit/configure.in
 ===================================================================
---- navit.orig/configure.in    2009-03-16 22:17:56.000000000 +0100
-+++ navit/configure.in 2009-03-16 22:18:00.000000000 +0100
-@@ -735,7 +735,6 @@
+--- navit.orig/configure.in    2009-03-30 17:00:19.000000000 +0200
++++ navit/configure.in 2009-03-30 17:00:23.000000000 +0200
+@@ -744,7 +744,6 @@
  navit/speech/cmdline/Makefile
  navit/speech/speech_dispatcher/Makefile
  navit/support/Makefile
@@ -13,8 +13,8 @@ Index: navit/configure.in
  navit/vehicle/gpsd/Makefile
 Index: navit/navit/support/Makefile.am
 ===================================================================
---- navit.orig/navit/support/Makefile.am       2009-03-16 22:17:56.000000000 +0100
-+++ navit/navit/support/Makefile.am    2009-03-16 22:18:00.000000000 +0100
+--- navit.orig/navit/support/Makefile.am       2009-03-30 17:00:19.000000000 +0200
++++ navit/navit/support/Makefile.am    2009-03-30 17:00:23.000000000 +0200
 @@ -1,5 +1,2 @@
  SUBDIRS=
 -if SUPPORT_WORDEXP

diff --git a/debian/patches/remove-zlib b/debian/patches/remove-zlib
index bb1f972..9377083 100644 (file)
--- a/debian/patches/remove-zlib
+++ b/debian/patches/remove-zlib
@@ -1,9 +1,9 @@
 Handles the removal of embedded zlib from upstream-svn.
 Index: navit/configure.in
 ===================================================================
---- navit.orig/configure.in    2009-03-16 22:17:50.000000000 +0100
-+++ navit/configure.in 2009-03-16 22:17:53.000000000 +0100
-@@ -739,7 +739,6 @@
+--- navit.orig/configure.in    2009-03-30 17:00:11.000000000 +0200
++++ navit/configure.in 2009-03-30 17:00:14.000000000 +0200
+@@ -748,7 +748,6 @@
  navit/support/Makefile
  navit/support/win32/Makefile
  navit/support/wordexp/Makefile
@@ -13,8 +13,8 @@ Index: navit/configure.in
  navit/vehicle/gpsd/Makefile
 Index: navit/navit/support/Makefile.am
 ===================================================================
---- navit.orig/navit/support/Makefile.am       2009-03-16 22:17:50.000000000 +0100
-+++ navit/navit/support/Makefile.am    2009-03-16 22:17:53.000000000 +0100
+--- navit.orig/navit/support/Makefile.am       2009-03-30 17:00:11.000000000 +0200
++++ navit/navit/support/Makefile.am    2009-03-30 17:00:14.000000000 +0200
 @@ -5,7 +5,4 @@
  if SUPPORT_WIN32
    SUBDIRS+=win32