Refresh patches

diff --git a/debian/patches/remove-espeak b/debian/patches/remove-espeak
index b4460fd..6b313e0 100644 (file)
--- a/debian/patches/remove-espeak
+++ b/debian/patches/remove-espeak
@@ -1,9 +1,9 @@
 Handle the removal of embedded libespeak from upstream-svn
 Index: navit/configure.in
 ===================================================================
---- navit.orig/configure.in    2009-09-28 14:02:00.000000000 +0200
-+++ navit/configure.in 2009-09-28 14:02:36.000000000 +0200
-@@ -817,7 +817,6 @@
+--- navit.orig/configure.in    2009-10-03 19:46:30.000000000 +0200
++++ navit/configure.in 2009-10-03 19:46:33.000000000 +0200
+@@ -811,7 +811,6 @@
  navit/speech/cmdline/Makefile
  navit/speech/speech_dispatcher/Makefile
  navit/support/Makefile

diff --git a/debian/patches/remove-ezxml b/debian/patches/remove-ezxml
index f092cfc..9d33258 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-09-28 13:59:08.000000000 +0200
-+++ navit/configure.in 2009-09-28 14:00:11.000000000 +0200
-@@ -820,7 +820,6 @@
+--- navit.orig/configure.in    2009-10-03 19:46:14.000000000 +0200
++++ navit/configure.in 2009-10-03 19:46:17.000000000 +0200
+@@ -814,7 +814,6 @@
  navit/speech/speech_dispatcher/Makefile
  navit/support/Makefile
  navit/support/espeak/Makefile

diff --git a/debian/patches/remove-glib b/debian/patches/remove-glib
index 7294c49..960501b 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-09-28 13:58:51.000000000 +0200
-+++ navit/configure.in 2009-09-28 13:58:59.000000000 +0200
-@@ -823,7 +823,6 @@
+--- navit.orig/configure.in    2009-10-03 19:46:00.000000000 +0200
++++ navit/configure.in 2009-10-03 19:46:08.000000000 +0200
+@@ -817,7 +817,6 @@
  navit/support/Makefile
  navit/support/espeak/Makefile
  navit/support/ezxml/Makefile

diff --git a/debian/patches/remove-libmdb.diff b/debian/patches/remove-libmdb.diff
index 1a728e5..a49f995 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-09-01 23:18:55.000000000 +0200
-+++ navit/navit/map/poi_geodownload/Makefile.am        2009-09-09 22:54:20.000000000 +0200
+--- navit.orig/navit/map/poi_geodownload/Makefile.am   2009-10-03 19:45:53.000000000 +0200
++++ navit/navit/map/poi_geodownload/Makefile.am        2009-10-03 19:46:14.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-09 22:53:47.000000000 +0200
-+++ navit/configure.in 2009-09-09 22:54:20.000000000 +0200
-@@ -796,8 +796,6 @@
+--- navit.orig/configure.in    2009-10-03 19:46:11.000000000 +0200
++++ navit/configure.in 2009-10-03 19:46:14.000000000 +0200
+@@ -790,8 +790,6 @@
  navit/map/binfile/Makefile
  navit/map/garmin/Makefile
  navit/map/poi_geodownload/Makefile

diff --git a/debian/patches/remove-libpng b/debian/patches/remove-libpng
index 17e6274..36329ea 100644 (file)
--- a/debian/patches/remove-libpng
+++ b/debian/patches/remove-libpng
@@ -1,9 +1,9 @@
 Handle the removal of embedded libpng from upstream-svn.
 Index: navit/configure.in
 ===================================================================
---- navit.orig/configure.in    2009-09-28 14:00:53.000000000 +0200
-+++ navit/configure.in 2009-09-28 14:01:23.000000000 +0200
-@@ -818,7 +818,6 @@
+--- navit.orig/configure.in    2009-10-03 19:46:28.000000000 +0200
++++ navit/configure.in 2009-10-03 19:46:30.000000000 +0200
+@@ -812,7 +812,6 @@
  navit/speech/speech_dispatcher/Makefile
  navit/support/Makefile
  navit/support/espeak/Makefile

diff --git a/debian/patches/remove-mini-libc b/debian/patches/remove-mini-libc
index efbacc6..7aa25dd 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-09-28 13:58:59.000000000 +0200
-+++ navit/configure.in 2009-09-28 13:59:04.000000000 +0200
-@@ -823,7 +823,6 @@
+--- navit.orig/configure.in    2009-10-03 19:46:08.000000000 +0200
++++ navit/configure.in 2009-10-03 19:46:11.000000000 +0200
+@@ -817,7 +817,6 @@
  navit/support/Makefile
  navit/support/espeak/Makefile
  navit/support/ezxml/Makefile

diff --git a/debian/patches/remove-support b/debian/patches/remove-support
index e970d68..9dad993 100644 (file)
--- a/debian/patches/remove-support
+++ b/debian/patches/remove-support
@@ -1,9 +1,9 @@
 Nothing to build from navit/support.
 Index: navit/configure.in
 ===================================================================
---- navit.orig/configure.in    2009-09-09 23:01:25.000000000 +0200
-+++ navit/configure.in 2009-09-09 23:01:25.000000000 +0200
-@@ -816,7 +816,6 @@
+--- navit.orig/configure.in    2009-10-03 19:46:33.000000000 +0200
++++ navit/configure.in 2009-10-03 19:46:35.000000000 +0200
+@@ -810,7 +810,6 @@
  navit/speech/android/Makefile
  navit/speech/cmdline/Makefile
  navit/speech/speech_dispatcher/Makefile
@@ -13,8 +13,8 @@ Index: navit/configure.in
  navit/vehicle/file/Makefile
 Index: navit/navit/Makefile.am
 ===================================================================
---- navit.orig/navit/Makefile.am       2009-09-09 23:01:33.000000000 +0200
-+++ navit/navit/Makefile.am    2009-09-09 23:02:18.000000000 +0200
+--- navit.orig/navit/Makefile.am       2009-10-03 19:46:00.000000000 +0200
++++ navit/navit/Makefile.am    2009-10-03 19:46:35.000000000 +0200
 @@ -1,6 +1,6 @@
  include $(top_srcdir)/Makefile.inc
 -DIST_SUBDIRS=binding map fib-1.1 font gui graphics osd speech support vehicle xpm maps

diff --git a/debian/patches/remove-ttf-liberation b/debian/patches/remove-ttf-liberation
index 2770e0a..8eda4bf 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-09-24 22:05:27.000000000 +0200
-+++ navit/configure.in 2009-09-28 13:58:51.000000000 +0200
-@@ -801,7 +801,6 @@
+--- navit.orig/configure.in    2009-10-03 19:45:54.000000000 +0200
++++ navit/configure.in 2009-10-03 19:46:00.000000000 +0200
+@@ -795,7 +795,6 @@
  navit/fib-1.1/Makefile
  navit/font/Makefile
  navit/font/freetype/Makefile
@@ -13,8 +13,8 @@ Index: navit/configure.in
  navit/graphics/gd/Makefile
 Index: navit/navit/Makefile.am
 ===================================================================
---- navit.orig/navit/Makefile.am       2009-09-24 22:05:27.000000000 +0200
-+++ navit/navit/Makefile.am    2009-09-28 13:58:51.000000000 +0200
+--- navit.orig/navit/Makefile.am       2009-10-03 19:45:53.000000000 +0200
++++ navit/navit/Makefile.am    2009-10-03 19:46:00.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

diff --git a/debian/patches/remove-win32 b/debian/patches/remove-win32
index 4978113..155aad9 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-09-28 14:00:35.000000000 +0200
-+++ navit/configure.in 2009-09-28 14:00:43.000000000 +0200
-@@ -807,11 +807,9 @@
+--- navit.orig/configure.in    2009-10-03 19:46:19.000000000 +0200
++++ navit/configure.in 2009-10-03 19:46:22.000000000 +0200
+@@ -801,11 +801,9 @@
  navit/graphics/null/Makefile
  navit/graphics/sdl/Makefile
  navit/graphics/qt_qpainter/Makefile
@@ -15,7 +15,7 @@ Index: navit/configure.in
  navit/osd/Makefile
  navit/osd/core/Makefile
  navit/speech/Makefile
-@@ -821,7 +819,6 @@
+@@ -815,7 +813,6 @@
  navit/support/Makefile
  navit/support/espeak/Makefile
  navit/support/libpng/Makefile
@@ -25,8 +25,8 @@ Index: navit/configure.in
  navit/vehicle/android/Makefile
 Index: navit/navit/gui/Makefile.am
 ===================================================================
---- navit.orig/navit/gui/Makefile.am   2009-09-09 23:02:29.000000000 +0200
-+++ navit/navit/gui/Makefile.am        2009-09-28 14:00:43.000000000 +0200
+--- navit.orig/navit/gui/Makefile.am   2009-10-03 19:45:52.000000000 +0200
++++ navit/navit/gui/Makefile.am        2009-10-03 19:46:22.000000000 +0200
 @@ -5,6 +5,3 @@
  if GUI_GTK
    SUBDIRS += gtk
@@ -36,8 +36,8 @@ Index: navit/navit/gui/Makefile.am
 -endif
 Index: navit/navit/graphics/Makefile.am
 ===================================================================
---- navit.orig/navit/graphics/Makefile.am      2009-09-09 23:02:30.000000000 +0200
-+++ navit/navit/graphics/Makefile.am   2009-09-28 14:00:43.000000000 +0200
+--- navit.orig/navit/graphics/Makefile.am      2009-10-03 19:45:52.000000000 +0200
++++ navit/navit/graphics/Makefile.am   2009-10-03 19:46:22.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 9d5263a..6a1ecdf 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-09-28 14:00:43.000000000 +0200
-+++ navit/configure.in 2009-09-28 14:00:53.000000000 +0200
-@@ -819,7 +819,6 @@
+--- navit.orig/configure.in    2009-10-03 19:46:22.000000000 +0200
++++ navit/configure.in 2009-10-03 19:46:28.000000000 +0200
+@@ -813,7 +813,6 @@
  navit/support/Makefile
  navit/support/espeak/Makefile
  navit/support/libpng/Makefile

diff --git a/debian/patches/remove-zlib b/debian/patches/remove-zlib
index 8eb083e..7ce87dc 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-09-28 14:00:11.000000000 +0200
-+++ navit/configure.in 2009-09-28 14:00:35.000000000 +0200
-@@ -823,7 +823,6 @@
+--- navit.orig/configure.in    2009-10-03 19:46:17.000000000 +0200
++++ navit/configure.in 2009-10-03 19:46:19.000000000 +0200
+@@ -817,7 +817,6 @@
  navit/support/libpng/Makefile
  navit/support/win32/Makefile
  navit/support/wordexp/Makefile