Refresh patches

diff --git a/debian/patches/no-default-poi-geodownload b/debian/patches/no-default-poi-geodownload
index e5584f6..b0c0240 100644 (file)
--- a/debian/patches/no-default-poi-geodownload
+++ b/debian/patches/no-default-poi-geodownload
@@ -1,9 +1,9 @@
 Don't build map/poi_geodownload by default
 Index: navit/configure.in
 ===================================================================
---- navit.orig/configure.in    2009-09-29 19:02:13.000000000 +0200
-+++ navit/configure.in 2009-09-29 19:08:55.000000000 +0200
-@@ -35,6 +35,7 @@
+--- navit.orig/configure.in    2009-11-16 14:30:15.000000000 +0100
++++ navit/configure.in 2009-11-16 14:30:15.000000000 +0100
+@@ -36,6 +36,7 @@
  plugins=yes; plugins_reason=default
  postgresql=yes; postgresql_reason=default
  samplemap=yes; samplemap_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
-@@ -216,6 +217,9 @@
+@@ -222,6 +223,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
-@@ -261,7 +265,8 @@
+@@ -267,7 +271,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 6b313e0..d1077eb 100644 (file)
--- a/debian/patches/remove-espeak
+++ b/debian/patches/remove-espeak
@@ -1,10 +1,10 @@
 Handle the removal of embedded libespeak from upstream-svn
 Index: navit/configure.in
 ===================================================================
---- 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.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/speech/espeak/Makefile
  navit/speech/speech_dispatcher/Makefile
  navit/support/Makefile
 -navit/support/espeak/Makefile

diff --git a/debian/patches/remove-ezxml b/debian/patches/remove-ezxml
index 9d33258..9cfabd9 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-10-03 19:46:14.000000000 +0200
-+++ navit/configure.in 2009-10-03 19:46:17.000000000 +0200
-@@ -814,7 +814,6 @@
+--- 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/speech/speech_dispatcher/Makefile
  navit/support/Makefile
  navit/support/espeak/Makefile

diff --git a/debian/patches/remove-glib b/debian/patches/remove-glib
index 960501b..93654b7 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-10-03 19:46:00.000000000 +0200
-+++ navit/configure.in 2009-10-03 19:46:08.000000000 +0200
-@@ -817,7 +817,6 @@
+--- 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/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 a49f995..f527177 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-03 19:45:53.000000000 +0200
-+++ navit/navit/map/poi_geodownload/Makefile.am        2009-10-03 19:46:14.000000000 +0200
+--- 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
 @@ -1,7 +1,6 @@
 -SUBDIRS=libmdb
  include $(top_srcdir)/Makefile.inc
@@ -15,14 +15,14 @@ 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-10-03 19:46:11.000000000 +0200
-+++ navit/configure.in 2009-10-03 19:46:14.000000000 +0200
-@@ -790,8 +790,6 @@
+--- 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/map/binfile/Makefile
  navit/map/garmin/Makefile
  navit/map/poi_geodownload/Makefile
 -navit/map/poi_geodownload/libmdb/Makefile
 -navit/map/poi_geodownload/libmdb/include/Makefile
+ navit/maptool/Makefile
  navit/fib-1.1/Makefile
  navit/font/Makefile
- navit/font/freetype/Makefile

diff --git a/debian/patches/remove-libpng b/debian/patches/remove-libpng
index 36329ea..324d117 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-10-03 19:46:28.000000000 +0200
-+++ navit/configure.in 2009-10-03 19:46:30.000000000 +0200
-@@ -812,7 +812,6 @@
+--- 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/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 7aa25dd..1969fcc 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-10-03 19:46:08.000000000 +0200
-+++ navit/configure.in 2009-10-03 19:46:11.000000000 +0200
-@@ -817,7 +817,6 @@
+--- 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/support/Makefile
  navit/support/espeak/Makefile
  navit/support/ezxml/Makefile

diff --git a/debian/patches/remove-support b/debian/patches/remove-support
index 9dad993..bc93e7c 100644 (file)
--- a/debian/patches/remove-support
+++ b/debian/patches/remove-support
@@ -1,11 +1,11 @@
 Nothing to build from navit/support.
 Index: navit/configure.in
 ===================================================================
---- 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.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/speech/cmdline/Makefile
+ navit/speech/espeak/Makefile
  navit/speech/speech_dispatcher/Makefile
 -navit/support/Makefile
  navit/vehicle/Makefile
@@ -13,14 +13,14 @@ Index: navit/configure.in
  navit/vehicle/file/Makefile
 Index: navit/navit/Makefile.am
 ===================================================================
---- 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
+--- 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 @@
  include $(top_srcdir)/Makefile.inc
--DIST_SUBDIRS=binding map fib-1.1 font 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
-+DIST_SUBDIRS=binding map fib-1.1 font gui graphics osd speech vehicle xpm maps
++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
- if BUILD_SAMPLEMAP
-   SUBDIRS += maps
- endif
+ 
+ SUBDIRS+=.
+ SUBDIRS+=maptool

diff --git a/debian/patches/remove-ttf-liberation b/debian/patches/remove-ttf-liberation
index 8eda4bf..61b762d 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-10-03 19:45:54.000000000 +0200
-+++ navit/configure.in 2009-10-03 19:46:00.000000000 +0200
-@@ -795,7 +795,6 @@
+--- 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/fib-1.1/Makefile
  navit/font/Makefile
  navit/font/freetype/Makefile
@@ -13,21 +13,18 @@ Index: navit/configure.in
  navit/graphics/gd/Makefile
 Index: navit/navit/Makefile.am
 ===================================================================
---- 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 @@
+--- 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
--DIST_SUBDIRS=binding map fib-1.1 font fonts gui graphics osd speech support vehicle xpm maps
-+DIST_SUBDIRS=binding map fib-1.1 font gui graphics osd speech support vehicle xpm maps
+-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
- if BUILD_SAMPLEMAP
-   SUBDIRS += maps
- endif
  
 -if FONTS
 -  SUBDIRS += fonts
 -endif
 -
- AM_CPPFLAGS = -I$(top_srcdir)/navit/fib-1.1 @NAVIT_CFLAGS@ @ZLIB_CFLAGS@ -DPREFIX=\"@prefix@\" -DLIBDIR=\"@libdir@\" -DMODULE=navit
- BUILT_SOURCES = version.h navit_config.h
- if BUILD_SAMPLEMAP
+ SUBDIRS+=.
+ SUBDIRS+=maptool
+ 

diff --git a/debian/patches/remove-win32 b/debian/patches/remove-win32
index 155aad9..422e531 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-10-03 19:46:19.000000000 +0200
-+++ navit/configure.in 2009-10-03 19:46:22.000000000 +0200
-@@ -801,11 +801,9 @@
+--- 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/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
-@@ -815,7 +813,6 @@
+@@ -834,7 +832,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-10-03 19:45:52.000000000 +0200
-+++ navit/navit/gui/Makefile.am        2009-10-03 19:46:22.000000000 +0200
+--- 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
 @@ -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-10-03 19:45:52.000000000 +0200
-+++ navit/navit/graphics/Makefile.am   2009-10-03 19:46:22.000000000 +0200
+--- 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
 @@ -14,9 +14,6 @@
  if USE_GRAPHICS_SDL
    SUBDIRS+=sdl

diff --git a/debian/patches/remove-wordexp b/debian/patches/remove-wordexp
index 6a1ecdf..7c85f7c 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-10-03 19:46:22.000000000 +0200
-+++ navit/configure.in 2009-10-03 19:46:28.000000000 +0200
-@@ -813,7 +813,6 @@
+--- 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/support/Makefile
  navit/support/espeak/Makefile
  navit/support/libpng/Makefile

diff --git a/debian/patches/remove-zlib b/debian/patches/remove-zlib
index 7ce87dc..426e5dc 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-10-03 19:46:17.000000000 +0200
-+++ navit/configure.in 2009-10-03 19:46:19.000000000 +0200
-@@ -817,7 +817,6 @@
+--- 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/support/libpng/Makefile
  navit/support/win32/Makefile
  navit/support/wordexp/Makefile