Refresh debian/patches

diff --git a/debian/patches/endianness b/debian/patches/endianness
index 3344c1a..e667896 100644 (file)
--- a/debian/patches/endianness
+++ b/debian/patches/endianness
@@ -1,8 +1,8 @@
 Handle endianness while reading data from mmapped mg files.
 Index: navit/navit/data.h
 ===================================================================
---- navit.orig/navit/data.h    2009-05-04 11:25:45.000000000 +0200
-+++ navit/navit/data.h 2009-05-18 22:31:15.000000000 +0200
+--- navit.orig/navit/data.h    2009-06-01 08:54:28.000000000 +0200
++++ navit/navit/data.h 2009-06-01 08:54:50.000000000 +0200
 @@ -20,6 +20,8 @@
  #ifndef NAVIT_DATA_H
  #define NAVIT_DATA_H
@@ -38,9 +38,9 @@ Index: navit/navit/data.h
  static inline unsigned int
 Index: navit/configure.in
 ===================================================================
---- navit.orig/configure.in    2009-05-18 22:31:13.000000000 +0200
-+++ navit/configure.in 2009-05-18 22:31:15.000000000 +0200
-@@ -86,6 +86,10 @@
+--- navit.orig/configure.in    2009-06-01 08:54:40.000000000 +0200
++++ navit/configure.in 2009-06-01 08:54:50.000000000 +0200
+@@ -87,6 +87,10 @@
  AC_SUBST(CC_FOR_BUILD)
  AC_SUBST(CCLD_FOR_BUILD)
  

diff --git a/debian/patches/moc_location b/debian/patches/moc_location
index e085bcc..480348e 100644 (file)
--- a/debian/patches/moc_location
+++ b/debian/patches/moc_location
@@ -1,9 +1,9 @@
 Force using qt4 moc when qt3 moc is in the way.
 Index: navit/configure.in
 ===================================================================
---- navit.orig/configure.in    2009-05-18 22:32:18.000000000 +0200
-+++ navit/configure.in 2009-05-18 22:32:22.000000000 +0200
-@@ -647,6 +647,8 @@
+--- navit.orig/configure.in    2009-06-01 08:54:28.000000000 +0200
++++ navit/configure.in 2009-06-01 08:54:40.000000000 +0200
+@@ -651,6 +651,8 @@
  fi
  if test "x${graphics_qt_qpainter}" = "xyes" ; then
        AC_DEFINE(USE_GRAPICS_QT_QPAINTER, 1, [Build with graphics qt_qpainter])
@@ -14,8 +14,8 @@ Index: navit/configure.in
  AC_SUBST(QT_GUI_LIBS)
 Index: navit/navit/graphics/qt_qpainter/Makefile.am
 ===================================================================
---- navit.orig/navit/graphics/qt_qpainter/Makefile.am  2009-05-18 22:32:21.000000000 +0200
-+++ navit/navit/graphics/qt_qpainter/Makefile.am       2009-05-18 22:32:22.000000000 +0200
+--- navit.orig/navit/graphics/qt_qpainter/Makefile.am  2009-06-01 08:54:37.000000000 +0200
++++ navit/navit/graphics/qt_qpainter/Makefile.am       2009-06-01 08:54:40.000000000 +0200
 @@ -5,7 +5,7 @@
  libgraphics_qt_qpainter_la_LDFLAGS = @QT_GUI_LIBS@ -module
  BUILT_SOURCES = graphics_qt_qpainter.moc

diff --git a/debian/patches/remove-ezxml b/debian/patches/remove-ezxml
index 2a573a2..f65ab5f 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-05-18 22:31:43.000000000 +0200
-+++ navit/configure.in 2009-05-18 22:31:46.000000000 +0200
-@@ -751,7 +751,6 @@
+--- navit.orig/configure.in    2009-06-01 08:55:08.000000000 +0200
++++ navit/configure.in 2009-06-01 08:55:11.000000000 +0200
+@@ -755,7 +755,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-05-18 22:31:40.000000000 +0200
-+++ navit/navit/support/Makefile.am    2009-05-18 22:31:46.000000000 +0200
+--- navit.orig/navit/support/Makefile.am       2009-06-01 08:55:03.000000000 +0200
++++ navit/navit/support/Makefile.am    2009-06-01 08:55:11.000000000 +0200
 @@ -1,7 +1,4 @@
  SUBDIRS=
 -if SUPPORT_EZXML

diff --git a/debian/patches/remove-glib b/debian/patches/remove-glib
index 021b6e2..0fdaa61 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-05-18 22:31:29.000000000 +0200
-+++ navit/configure.in 2009-05-18 22:31:36.000000000 +0200
-@@ -754,7 +754,6 @@
+--- navit.orig/configure.in    2009-06-01 08:54:54.000000000 +0200
++++ navit/configure.in 2009-06-01 08:54:59.000000000 +0200
+@@ -758,7 +758,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-05-04 11:25:45.000000000 +0200
-+++ navit/navit/support/Makefile.am    2009-05-18 22:31:36.000000000 +0200
+--- navit.orig/navit/support/Makefile.am       2009-06-01 08:54:27.000000000 +0200
++++ navit/navit/support/Makefile.am    2009-06-01 08:54:59.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 30be16d..752d946 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-05-04 11:25:44.000000000 +0200
-+++ navit/navit/map/poi_geodownload/Makefile.am        2009-05-18 22:31:43.000000000 +0200
+--- navit.orig/navit/map/poi_geodownload/Makefile.am   2009-06-01 08:54:27.000000000 +0200
++++ navit/navit/map/poi_geodownload/Makefile.am        2009-06-01 08:55:08.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-05-18 22:31:40.000000000 +0200
-+++ navit/configure.in 2009-05-18 22:31:43.000000000 +0200
-@@ -730,8 +730,6 @@
+--- navit.orig/configure.in    2009-06-01 08:55:03.000000000 +0200
++++ navit/configure.in 2009-06-01 08:55:08.000000000 +0200
+@@ -734,8 +734,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 f393b37..ef0ad98 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-05-18 22:31:36.000000000 +0200
-+++ navit/configure.in 2009-05-18 22:31:40.000000000 +0200
-@@ -754,7 +754,6 @@
+--- navit.orig/configure.in    2009-06-01 08:54:59.000000000 +0200
++++ navit/configure.in 2009-06-01 08:55:03.000000000 +0200
+@@ -758,7 +758,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-05-18 22:31:36.000000000 +0200
-+++ navit/navit/support/Makefile.am    2009-05-18 22:31:40.000000000 +0200
+--- navit.orig/navit/support/Makefile.am       2009-06-01 08:54:59.000000000 +0200
++++ navit/navit/support/Makefile.am    2009-06-01 08:55:03.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 dd57723..bfe8b6e 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-05-18 22:31:15.000000000 +0200
-+++ navit/configure.in 2009-05-18 22:31:29.000000000 +0200
-@@ -735,7 +735,6 @@
+--- navit.orig/configure.in    2009-06-01 08:54:50.000000000 +0200
++++ navit/configure.in 2009-06-01 08:54:54.000000000 +0200
+@@ -739,7 +739,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-05-04 11:25:45.000000000 +0200
-+++ navit/navit/Makefile.am    2009-05-18 22:31:29.000000000 +0200
+--- navit.orig/navit/Makefile.am       2009-06-01 08:54:27.000000000 +0200
++++ navit/navit/Makefile.am    2009-06-01 08:54:54.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 260ae08..ff68ec4 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-05-18 22:31:48.000000000 +0200
-+++ navit/configure.in 2009-05-18 22:31:52.000000000 +0200
-@@ -740,18 +740,15 @@
+--- navit.orig/configure.in    2009-06-01 08:55:15.000000000 +0200
++++ navit/configure.in 2009-06-01 08:55:18.000000000 +0200
+@@ -744,18 +744,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-05-18 22:31:48.000000000 +0200
-+++ navit/navit/support/Makefile.am    2009-05-18 22:31:52.000000000 +0200
+--- navit.orig/navit/support/Makefile.am       2009-06-01 08:55:15.000000000 +0200
++++ navit/navit/support/Makefile.am    2009-06-01 08:55:18.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-05-04 11:25:44.000000000 +0200
-+++ navit/navit/gui/Makefile.am        2009-05-18 22:31:52.000000000 +0200
+--- navit.orig/navit/gui/Makefile.am   2009-06-01 08:54:26.000000000 +0200
++++ navit/navit/gui/Makefile.am        2009-06-01 08:55:18.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-05-04 11:25:44.000000000 +0200
-+++ navit/navit/graphics/Makefile.am   2009-05-18 22:31:52.000000000 +0200
+--- navit.orig/navit/graphics/Makefile.am      2009-06-01 08:54:26.000000000 +0200
++++ navit/navit/graphics/Makefile.am   2009-06-01 08:55:18.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 6a2cbc5..9a4865a 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-05-18 22:31:52.000000000 +0200
-+++ navit/configure.in 2009-05-18 22:31:55.000000000 +0200
-@@ -749,7 +749,6 @@
+--- navit.orig/configure.in    2009-06-01 08:54:04.000000000 +0200
++++ navit/configure.in 2009-06-01 08:54:04.000000000 +0200
+@@ -753,7 +753,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-05-18 22:31:52.000000000 +0200
-+++ navit/navit/support/Makefile.am    2009-05-18 22:31:55.000000000 +0200
+--- navit.orig/navit/support/Makefile.am       2009-06-01 08:54:04.000000000 +0200
++++ navit/navit/support/Makefile.am    2009-06-01 08:54:04.000000000 +0200
 @@ -1,5 +1,2 @@
  SUBDIRS=
 -if SUPPORT_WORDEXP

diff --git a/debian/patches/remove-zlib b/debian/patches/remove-zlib
index 8af20c3..ec2be18 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-05-18 22:31:46.000000000 +0200
-+++ navit/configure.in 2009-05-18 22:31:48.000000000 +0200
-@@ -753,7 +753,6 @@
+--- navit.orig/configure.in    2009-06-01 08:55:11.000000000 +0200
++++ navit/configure.in 2009-06-01 08:55:15.000000000 +0200
+@@ -757,7 +757,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-05-18 22:31:46.000000000 +0200
-+++ navit/navit/support/Makefile.am    2009-05-18 22:31:48.000000000 +0200
+--- navit.orig/navit/support/Makefile.am       2009-06-01 08:55:11.000000000 +0200
++++ navit/navit/support/Makefile.am    2009-06-01 08:55:15.000000000 +0200
 @@ -5,7 +5,4 @@
  if SUPPORT_WIN32
    SUBDIRS+=win32