Refresh debian/patches.

diff --git a/debian/patches/mg-alignment b/debian/patches/mg-alignment
index 65fab86..d92e931 100644 (file)
--- a/debian/patches/mg-alignment
+++ b/debian/patches/mg-alignment
@@ -1,8 +1,8 @@
 Alignment fix for mg plugin.
-Index: navit-0.1.1.~svn2067/navit/map/mg/mg.h
+Index: navit/navit/map/mg/mg.h
 ===================================================================
---- navit-0.1.1.~svn2067.orig/navit/map/mg/mg.h        2009-03-01 18:34:09.000000000 +0100
-+++ navit-0.1.1.~svn2067/navit/map/mg/mg.h     2009-03-01 19:12:05.000000000 +0100
+--- navit.orig/navit/map/mg/mg.h       2009-03-16 22:09:29.000000000 +0100
++++ navit/navit/map/mg/mg.h    2009-03-16 22:10:26.000000000 +0100
 @@ -151,6 +151,11 @@
        int tmp_len;
        unsigned char *tmp_data;
@@ -15,7 +15,7 @@ Index: navit-0.1.1.~svn2067/navit/map/mg/mg.h
  
  struct street_name_number {
          int len;
-@@ -239,10 +244,12 @@
+@@ -240,10 +245,12 @@
  };
  
  struct block_offset {
@@ -31,10 +31,10 @@ Index: navit-0.1.1.~svn2067/navit/map/mg/mg.h
  
  struct tree_search_node {
        struct tree_hdr *hdr;
-Index: navit-0.1.1.~svn2067/navit/map/mg/town.c
+Index: navit/navit/map/mg/town.c
 ===================================================================
---- navit-0.1.1.~svn2067.orig/navit/map/mg/town.c      2009-03-01 18:34:09.000000000 +0100
-+++ navit-0.1.1.~svn2067/navit/map/mg/town.c   2009-03-01 19:08:51.000000000 +0100
+--- navit.orig/navit/map/mg/town.c     2009-03-12 22:30:06.000000000 +0100
++++ navit/navit/map/mg/town.c  2009-03-16 22:10:26.000000000 +0100
 @@ -275,9 +275,9 @@
        }
        if (! mr->search_blk_count)
@@ -48,10 +48,10 @@ Index: navit-0.1.1.~svn2067/navit/map/mg/town.c
        town_get(mr, &mr->town, &mr->item);
        mr->search_blk_off++;
        mr->search_blk_count--;
-Index: navit-0.1.1.~svn2067/navit/map/mg/street.c
+Index: navit/navit/map/mg/street.c
 ===================================================================
---- navit-0.1.1.~svn2067.orig/navit/map/mg/street.c    2009-03-01 18:34:10.000000000 +0100
-+++ navit-0.1.1.~svn2067/navit/map/mg/street.c 2009-03-01 19:08:51.000000000 +0100
+--- navit.orig/navit/map/mg/street.c   2009-03-16 22:09:29.000000000 +0100
++++ navit/navit/map/mg/street.c        2009-03-16 22:10:26.000000000 +0100
 @@ -52,8 +52,8 @@
        name_numbers->dist=get_u32_unal(p);
        name_numbers->country=get_u32_unal(p);
@@ -74,7 +74,7 @@ Index: navit-0.1.1.~svn2067/navit/map/mg/street.c
          name_number->segment=(struct street_name_segment *)p;
        *p=start+name_number->len;
  }
-@@ -627,7 +627,7 @@
+@@ -632,7 +632,7 @@
        dbg(1,"aux_data=%p\n", p);
        if (count) {
                street_name_numbers_get(&snns, &p);
@@ -83,10 +83,10 @@ Index: navit-0.1.1.~svn2067/navit/map/mg/street.c
                return 1;
        }
        
-Index: navit-0.1.1.~svn2067/navit/data.h
+Index: navit/navit/data.h
 ===================================================================
---- navit-0.1.1.~svn2067.orig/navit/data.h     2009-03-01 18:34:10.000000000 +0100
-+++ navit-0.1.1.~svn2067/navit/data.h  2009-03-01 19:08:51.000000000 +0100
+--- navit.orig/navit/data.h    2009-03-12 22:30:06.000000000 +0100
++++ navit/navit/data.h 2009-03-16 22:10:26.000000000 +0100
 @@ -53,6 +53,15 @@
  
  

diff --git a/debian/patches/remove-ezxml b/debian/patches/remove-ezxml
index 0560b00..741bf4e 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-12 22:27:15.000000000 +0100
-+++ navit/configure.in 2009-03-12 22:27:24.000000000 +0100
-@@ -731,7 +731,6 @@
+--- 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/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-12 22:27:08.000000000 +0100
-+++ navit/navit/support/Makefile.am    2009-03-12 22:27:24.000000000 +0100
+--- 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
 @@ -1,7 +1,4 @@
  SUBDIRS=
 -if SUPPORT_EZXML

diff --git a/debian/patches/remove-glib b/debian/patches/remove-glib
index da69ddd..5785a97 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-12 22:26:47.000000000 +0100
-+++ navit/configure.in 2009-03-12 22:27:00.000000000 +0100
-@@ -734,7 +734,6 @@
+--- 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/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-08 22:17:43.000000000 +0100
-+++ navit/navit/support/Makefile.am    2009-03-12 22:27:00.000000000 +0100
+--- 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
 @@ -2,9 +2,6 @@
  if SUPPORT_EZXML
    SUBDIRS+=ezxml

diff --git a/debian/patches/remove-libmdb.diff b/debian/patches/remove-libmdb.diff
index b5b6f8e..6fd2c50 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-08 22:17:43.000000000 +0100
-+++ navit/navit/map/poi_geodownload/Makefile.am        2009-03-12 22:27:15.000000000 +0100
+--- 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
 @@ -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-12 22:27:08.000000000 +0100
-+++ navit/configure.in 2009-03-12 22:27:15.000000000 +0100
-@@ -709,8 +709,6 @@
+--- 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/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 609cfb3..648e26f 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-12 22:27:00.000000000 +0100
-+++ navit/configure.in 2009-03-12 22:27:08.000000000 +0100
-@@ -734,7 +734,6 @@
+--- 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/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-12 22:27:00.000000000 +0100
-+++ navit/navit/support/Makefile.am    2009-03-12 22:27:08.000000000 +0100
+--- 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
 @@ -11,7 +11,4 @@
  if SUPPORT_ZLIB
    SUBDIRS+=zlib

diff --git a/debian/patches/remove-ttf-liberation b/debian/patches/remove-ttf-liberation
index 4b7fb36..9c75bc1 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-12 21:25:31.000000000 +0100
-+++ navit/configure.in 2009-03-12 22:26:47.000000000 +0100
-@@ -714,7 +714,6 @@
+--- 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/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-08 22:17:43.000000000 +0100
-+++ navit/navit/Makefile.am    2009-03-12 22:26:47.000000000 +0100
+--- 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
 @@ -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 3b512f1..28afd02 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-12 22:27:30.000000000 +0100
-+++ navit/configure.in 2009-03-12 22:29:15.000000000 +0100
-@@ -720,18 +720,15 @@
+--- 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/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-12 22:27:30.000000000 +0100
-+++ navit/navit/support/Makefile.am    2009-03-12 22:28:04.000000000 +0100
+--- 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
 @@ -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 21:25:31.000000000 +0100
-+++ navit/navit/gui/Makefile.am        2009-03-12 22:28:04.000000000 +0100
+--- 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
 @@ -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 21:25:31.000000000 +0100
-+++ navit/navit/graphics/Makefile.am   2009-03-12 22:28:04.000000000 +0100
+--- 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
 @@ -11,9 +11,6 @@
  if USE_GRAPHICS_SDL
    SUBDIRS+=sdl

diff --git a/debian/patches/remove-wordexp b/debian/patches/remove-wordexp
index f916691..4859342 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-12 22:29:15.000000000 +0100
-+++ navit/configure.in 2009-03-12 22:29:41.000000000 +0100
-@@ -729,7 +729,6 @@
+--- 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/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-12 22:28:04.000000000 +0100
-+++ navit/navit/support/Makefile.am    2009-03-12 22:29:41.000000000 +0100
+--- 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
 @@ -1,5 +1,2 @@
  SUBDIRS=
 -if SUPPORT_WORDEXP

diff --git a/debian/patches/remove-zlib b/debian/patches/remove-zlib
index f737378..bb1f972 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-12 22:27:24.000000000 +0100
-+++ navit/configure.in 2009-03-12 22:27:30.000000000 +0100
-@@ -733,7 +733,6 @@
+--- 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/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-12 22:27:24.000000000 +0100
-+++ navit/navit/support/Makefile.am    2009-03-12 22:27:30.000000000 +0100
+--- 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
 @@ -5,7 +5,4 @@
  if SUPPORT_WIN32
    SUBDIRS+=win32