Update patches

Remove patch autogen.sh applied upstream.

diff --git a/debian/patches/autogen.sh b/debian/patches/autogen.sh
deleted file mode 100644 (file)
index 1b15739..0000000
--- a/debian/patches/autogen.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-Remove bashism from autogen.sh
-Index: navit/autogen.sh
-===================================================================
---- navit.orig/autogen.sh      2009-10-03 21:53:56.000000000 +0200
-+++ navit/autogen.sh   2009-10-03 21:54:14.000000000 +0200
-@@ -1,5 +1,5 @@
- #!/bin/sh
--if [ `uname` == Darwin ]; then
-+if [ `uname` = Darwin ]; then
-       LIBTOOL=glibtool
- else
-       LIBTOOL=libtool

diff --git a/debian/patches/default_to_gui_internal b/debian/patches/default_to_gui_internal
index e9a4aa6..52aa9c8 100644 (file)
--- a/debian/patches/default_to_gui_internal
+++ b/debian/patches/default_to_gui_internal
@@ -1,17 +1,17 @@
 Configure gui-internal as the default gui in navit.xml
 Index: navit/navit/navit_shipped.xml
 ===================================================================
---- navit.orig/navit/navit_shipped.xml 2009-09-01 22:57:36.000000000 +0200
-+++ navit/navit/navit_shipped.xml      2009-09-01 22:58:05.000000000 +0200
+--- navit.orig/navit/navit_shipped.xml 2009-10-12 11:13:55.000000000 +0200
++++ navit/navit/navit_shipped.xml      2009-10-12 11:22:16.000000000 +0200
 @@ -35,9 +35,9 @@
               Here's an example for a freerunner: -->
          <!-- <gui type="internal" font_size="350" icon_xs="32" icon_s="96" icon_l="96"/> -->
-       <!-- Normally it is sufficient to use -->
+         <!-- Normally it is sufficient to use -->
 -        <!-- <gui type="internal" /> -->
 +        <gui type="internal" />
  
 -        <gui type="gtk" menubar="1" toolbar="1" statusbar="1"/>
 +        <!-- <gui type="gtk" menubar="1" toolbar="1" statusbar="1"/> -->
  
-       <!-- for a debug log -->
+         <!-- for a debug log -->
          <log enabled="no" type="textfile_debug" data="debug_%Y%m%d-%i.txt" flush_size="1000" flush_time="30"/>

diff --git a/debian/patches/series b/debian/patches/series
index a5e340e..de10fb9 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-autogen.sh
 default_to_gui_internal
 distclean_graphics_qt_qpainter
 remove-ttf-liberation