Refresh patches

diff --git a/debian/patches/no-default-poi-geodownload b/debian/patches/no-default-poi-geodownload
index b0c0240..3f72405 100644 (file)
--- a/debian/patches/no-default-poi-geodownload
+++ b/debian/patches/no-default-poi-geodownload
@@ -1,8 +1,8 @@
 Don't build map/poi_geodownload by default
 Index: navit/configure.in
 ===================================================================
---- navit.orig/configure.in    2009-11-16 14:30:15.000000000 +0100
-+++ navit/configure.in 2009-11-16 14:30:15.000000000 +0100
+--- navit.orig/configure.in    2009-12-10 22:18:56.000000000 +0100
++++ navit/configure.in 2009-12-10 22:20:38.000000000 +0100
 @@ -36,6 +36,7 @@
  plugins=yes; plugins_reason=default
  postgresql=yes; postgresql_reason=default
@@ -11,7 +11,7 @@ Index: navit/configure.in
  binding_dbus=yes; binding_dbus_reason=default
  binding_python=yes; binding_python_reason=default
  font_freetype=yes; font_freetype_reason=default
-@@ -222,6 +223,9 @@
+@@ -225,6 +226,9 @@
  X_CFLAGS="-I$x_includes"
  AS_IF([test -n "$ac_x_libraries"], [X_LIBS="-L$ac_x_libraries"])
  
@@ -21,7 +21,7 @@ Index: navit/configure.in
  # glib
  AC_ARG_ENABLE(glib, [  --disable-glib             don't build with external glib], glib=$enableval, glib=yes)
  if test x"${glib}" = "xyes"; then
-@@ -267,7 +271,8 @@
+@@ -270,7 +274,8 @@
  AM_CONDITIONAL(EVENT_GLIB, [test "x$glib" = "xyes"])
  AM_CONDITIONAL(SUPPORT_GLIB, [test "x$glib" = "xno"])
  AM_CONDITIONAL(SUPPORT_EZXML, [test "x$glib" = "xno"])

diff --git a/debian/patches/remove-espeak b/debian/patches/remove-espeak
index d1077eb..fdc2665 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-11-16 14:31:11.000000000 +0100
-+++ navit/configure.in 2009-11-16 14:31:14.000000000 +0100
-@@ -830,7 +830,6 @@
+--- navit.orig/configure.in    2009-12-10 22:18:39.000000000 +0100
++++ navit/configure.in 2009-12-10 22:18:41.000000000 +0100
+@@ -842,7 +842,6 @@
  navit/speech/espeak/Makefile
  navit/speech/speech_dispatcher/Makefile
  navit/support/Makefile

diff --git a/debian/patches/remove-ezxml b/debian/patches/remove-ezxml
index 9cfabd9..8536e53 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-11-16 14:30:54.000000000 +0100
-+++ navit/configure.in 2009-11-16 14:30:58.000000000 +0100
-@@ -833,7 +833,6 @@
+--- navit.orig/configure.in    2009-12-10 22:18:21.000000000 +0100
++++ navit/configure.in 2009-12-10 22:18:25.000000000 +0100
+@@ -845,7 +845,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 93654b7..5c1f995 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-11-16 14:30:44.000000000 +0100
-+++ navit/configure.in 2009-11-16 14:30:45.000000000 +0100
-@@ -836,7 +836,6 @@
+--- navit.orig/configure.in    2009-12-10 22:14:44.000000000 +0100
++++ navit/configure.in 2009-12-10 22:17:56.000000000 +0100
+@@ -848,7 +848,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 f527177..0d3505d 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-10-12 22:16:40.000000000 +0200
-+++ navit/navit/map/poi_geodownload/Makefile.am        2009-11-16 14:22:23.000000000 +0100
+--- navit.orig/navit/map/poi_geodownload/Makefile.am   2009-11-26 23:10:50.000000000 +0100
++++ navit/navit/map/poi_geodownload/Makefile.am        2009-12-10 22:18:21.000000000 +0100
 @@ -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-11-16 14:22:10.000000000 +0100
-+++ navit/configure.in 2009-11-16 14:24:14.000000000 +0100
-@@ -807,8 +807,6 @@
+--- navit.orig/configure.in    2009-12-10 22:18:16.000000000 +0100
++++ navit/configure.in 2009-12-10 22:18:21.000000000 +0100
+@@ -819,8 +819,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 324d117..98b5de6 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-11-16 14:31:09.000000000 +0100
-+++ navit/configure.in 2009-11-16 14:31:11.000000000 +0100
-@@ -831,7 +831,6 @@
+--- navit.orig/configure.in    2009-12-10 22:18:35.000000000 +0100
++++ navit/configure.in 2009-12-10 22:18:39.000000000 +0100
+@@ -843,7 +843,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 1969fcc..9eb5f3e 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-11-16 14:30:45.000000000 +0100
-+++ navit/configure.in 2009-11-16 14:30:51.000000000 +0100
-@@ -836,7 +836,6 @@
+--- navit.orig/configure.in    2009-12-10 22:17:56.000000000 +0100
++++ navit/configure.in 2009-12-10 22:18:16.000000000 +0100
+@@ -848,7 +848,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 bc93e7c..e9823b7 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-11-16 14:30:15.000000000 +0100
-+++ navit/configure.in 2009-11-16 14:30:26.000000000 +0100
-@@ -829,7 +829,6 @@
+--- navit.orig/configure.in    2009-12-10 22:18:41.000000000 +0100
++++ navit/configure.in 2009-12-10 22:18:56.000000000 +0100
+@@ -841,7 +841,6 @@
  navit/speech/cmdline/Makefile
  navit/speech/espeak/Makefile
  navit/speech/speech_dispatcher/Makefile
@@ -13,14 +13,18 @@ Index: navit/configure.in
  navit/vehicle/file/Makefile
 Index: navit/navit/Makefile.am
 ===================================================================
---- navit.orig/navit/Makefile.am       2009-11-16 14:30:15.000000000 +0100
-+++ navit/navit/Makefile.am    2009-11-16 14:30:15.000000000 +0100
-@@ -1,6 +1,6 @@
+--- navit.orig/navit/Makefile.am       2009-12-10 22:17:03.000000000 +0100
++++ navit/navit/Makefile.am    2009-12-10 22:20:08.000000000 +0100
+@@ -1,10 +1,10 @@
  include $(top_srcdir)/Makefile.inc
+ comma=,
+-SUBDIRS=fib-1.1 support
++SUBDIRS=fib-1.1
+ if PLUGINS
+   SUBDIRS += .
+ endif
 -DIST_SUBDIRS=binding map maptool fib-1.1 font gui graphics osd speech support vehicle xpm maps
--SUBDIRS=binding map fib-1.1 font gui graphics osd speech support vehicle xpm
 +DIST_SUBDIRS=binding map maptool fib-1.1 font gui graphics osd speech vehicle xpm maps
-+SUBDIRS=binding map fib-1.1 font gui graphics osd speech vehicle xpm
+ SUBDIRS+=binding map font gui graphics osd speech vehicle xpm
  
- SUBDIRS+=.
- SUBDIRS+=maptool
+ if !PLUGINS

diff --git a/debian/patches/remove-ttf-liberation b/debian/patches/remove-ttf-liberation
index 61b762d..be74146 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-11-16 14:18:41.000000000 +0100
-+++ navit/configure.in 2009-11-16 14:19:52.000000000 +0100
-@@ -813,7 +813,6 @@
+--- navit.orig/configure.in    2009-12-10 21:39:47.000000000 +0100
++++ navit/configure.in 2009-12-10 22:14:44.000000000 +0100
+@@ -825,7 +825,6 @@
  navit/fib-1.1/Makefile
  navit/font/Makefile
  navit/font/freetype/Makefile
@@ -13,18 +13,19 @@ Index: navit/configure.in
  navit/graphics/gd/Makefile
 Index: navit/navit/Makefile.am
 ===================================================================
---- navit.orig/navit/Makefile.am       2009-11-16 14:18:41.000000000 +0100
-+++ navit/navit/Makefile.am    2009-11-16 14:22:01.000000000 +0100
-@@ -1,11 +1,7 @@
- include $(top_srcdir)/Makefile.inc
+--- navit.orig/navit/Makefile.am       2009-12-10 21:39:47.000000000 +0100
++++ navit/navit/Makefile.am    2009-12-10 22:17:03.000000000 +0100
+@@ -4,12 +4,9 @@
+ if PLUGINS
+   SUBDIRS += .
+ endif
 -DIST_SUBDIRS=binding map maptool fib-1.1 font fonts gui graphics osd speech support vehicle xpm maps
 +DIST_SUBDIRS=binding map maptool fib-1.1 font gui graphics osd speech support vehicle xpm maps
- SUBDIRS=binding map fib-1.1 font gui graphics osd speech support vehicle xpm
+ SUBDIRS+=binding map font gui graphics osd speech vehicle xpm
  
 -if FONTS
 -  SUBDIRS += fonts
 -endif
--
- SUBDIRS+=.
- SUBDIRS+=maptool
- 
+ if !PLUGINS
+   SUBDIRS += .
+ endif

diff --git a/debian/patches/remove-win32 b/debian/patches/remove-win32
index 422e531..401424f 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-11-16 14:31:01.000000000 +0100
-+++ navit/configure.in 2009-11-16 14:31:04.000000000 +0100
-@@ -819,11 +819,9 @@
+--- navit.orig/configure.in    2009-12-10 22:18:27.000000000 +0100
++++ navit/configure.in 2009-12-10 22:18:30.000000000 +0100
+@@ -831,11 +831,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
-@@ -834,7 +832,6 @@
+@@ -846,7 +844,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-11-16 14:30:35.000000000 +0100
-+++ navit/navit/gui/Makefile.am        2009-11-16 14:31:04.000000000 +0100
+--- navit.orig/navit/gui/Makefile.am   2009-11-26 23:10:50.000000000 +0100
++++ navit/navit/gui/Makefile.am        2009-12-10 22:18:30.000000000 +0100
 @@ -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-11-16 14:30:35.000000000 +0100
-+++ navit/navit/graphics/Makefile.am   2009-11-16 14:31:04.000000000 +0100
+--- navit.orig/navit/graphics/Makefile.am      2009-11-26 23:10:50.000000000 +0100
++++ navit/navit/graphics/Makefile.am   2009-12-10 22:18:30.000000000 +0100
 @@ -14,9 +14,6 @@
  if USE_GRAPHICS_SDL
    SUBDIRS+=sdl

diff --git a/debian/patches/remove-wordexp b/debian/patches/remove-wordexp
index 7c85f7c..a8ef965 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-11-16 14:31:04.000000000 +0100
-+++ navit/configure.in 2009-11-16 14:31:09.000000000 +0100
-@@ -832,7 +832,6 @@
+--- navit.orig/configure.in    2009-12-10 22:18:30.000000000 +0100
++++ navit/configure.in 2009-12-10 22:18:35.000000000 +0100
+@@ -844,7 +844,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 426e5dc..77a800d 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-11-16 14:30:58.000000000 +0100
-+++ navit/configure.in 2009-11-16 14:31:01.000000000 +0100
-@@ -836,7 +836,6 @@
+--- navit.orig/configure.in    2009-12-10 22:18:25.000000000 +0100
++++ navit/configure.in 2009-12-10 22:18:27.000000000 +0100
+@@ -848,7 +848,6 @@
  navit/support/libpng/Makefile
  navit/support/win32/Makefile
  navit/support/wordexp/Makefile