[SCM] spatialite-tools branch, master, updated. debian/3.0.0-2-11-ga20865c

[David Paleino]

The following commit has been merged in the master branch:
commit fbf4abef39a444df7b4207a69bb34a8f61e9dd00
Author: David Paleino <dapal at debian.org>
Date:   Wed Oct 3 22:26:17 2012 +0200

    Patches adapted to new source

diff --git a/debian/changelog b/debian/changelog
index c264ec3..6269323 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 spatialite-tools (3.1.0b-1) UNRELEASED; urgency=low
 
   * New upstream version
+  * Patches adapted to new source
 
- -- David Paleino <dapal at debian.org>  Wed, 03 Oct 2012 22:21:10 +0200
+ -- David Paleino <dapal at debian.org>  Wed, 03 Oct 2012 22:25:27 +0200
 
 spatialite-tools (3.0.0-2) unstable; urgency=low
 
diff --git a/debian/patches/00-add_automake_foreign.patch b/debian/patches/00-add_automake_foreign.patch
index 758b9dc..c4cd633 100644
--- a/debian/patches/00-add_automake_foreign.patch
+++ b/debian/patches/00-add_automake_foreign.patch
@@ -10,7 +10,7 @@ Forwarded: no
 
 --- spatialite-tools.orig/Makefile.am
 +++ spatialite-tools/Makefile.am
-@@ -48,5 +48,5 @@ EXTRA_DIST = makefile.vc nmake.opt \
+@@ -45,5 +45,5 @@ EXTRA_DIST = makefile.vc nmake.opt \
  	Makefile-static-Linux \
  	Makefile-static-MacOsX
  
@@ -19,12 +19,12 @@ Forwarded: no
  
 --- spatialite-tools.orig/Makefile.in
 +++ spatialite-tools/Makefile.in
-@@ -294,7 +294,7 @@ EXTRA_DIST = makefile.vc nmake.opt \
+@@ -300,7 +300,7 @@ EXTRA_DIST = makefile.vc nmake.opt \
  	Makefile-static-Linux \
  	Makefile-static-MacOsX
  
 -AUTOMAKE_OPTIONS = dist-zip
 +AUTOMAKE_OPTIONS = dist-zip foreign
- all: all-am
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
  
- .SUFFIXES:
diff --git a/debian/patches/03-fix_typos.patch b/debian/patches/03-fix_typos.patch
index b5b4bb6..6e7f7cc 100644
--- a/debian/patches/03-fix_typos.patch
+++ b/debian/patches/03-fix_typos.patch
@@ -12,7 +12,7 @@ Forwarded: no
 
 --- spatialite-tools.orig/spatialite_gml.c
 +++ spatialite-tools/spatialite_gml.c
-@@ -1919,7 +1919,7 @@ main (int argc, char *argv[])
+@@ -1921,7 +1921,7 @@ main (int argc, char *argv[])
  	  ret = sqlite3_backup_finish (backup);
  	  sqlite3_close (handle);
  	  handle = disk_db_handle;
@@ -23,7 +23,7 @@ Forwarded: no
      sqlite3_close (handle);
 --- spatialite-tools.orig/spatialite_osm_map.c
 +++ spatialite-tools/spatialite_osm_map.c
-@@ -2038,7 +2038,7 @@ db_vacuum (sqlite3 * db_handle)
+@@ -1976,7 +1976,7 @@ db_vacuum (sqlite3 * db_handle)
  	  sqlite3_free (sql_err);
  	  return;
        }
@@ -32,7 +32,7 @@ Forwarded: no
  }
  
  static void
-@@ -2870,7 +2870,7 @@ main (int argc, char *argv[])
+@@ -2810,7 +2810,7 @@ main (int argc, char *argv[])
  	  ret = sqlite3_backup_finish (backup);
  	  sqlite3_close (handle);
  	  handle = disk_db_handle;
@@ -43,7 +43,7 @@ Forwarded: no
  /* VACUUMing */
 --- spatialite-tools.orig/spatialite_osm_net.c
 +++ spatialite-tools/spatialite_osm_net.c
-@@ -2030,7 +2030,7 @@ db_vacuum (sqlite3 * handle)
+@@ -1746,7 +1746,7 @@ db_vacuum (sqlite3 * handle)
  	  sqlite3_free (sql_err);
  	  return;
        }
@@ -51,8 +51,8 @@ Forwarded: no
 +    printf ("\tAll done: OSM graph was successfully loaded\n");
  }
  
- static void
-@@ -2644,7 +2644,7 @@ main (int argc, char *argv[])
+ static int
+@@ -2721,7 +2721,7 @@ main (int argc, char *argv[])
  	  ret = sqlite3_backup_finish (backup);
  	  sqlite3_close (handle);
  	  handle = disk_handle;
@@ -63,7 +63,7 @@ Forwarded: no
      db_vacuum (handle);
 --- spatialite-tools.orig/spatialite_osm_raw.c
 +++ spatialite-tools/spatialite_osm_raw.c
-@@ -1649,7 +1649,7 @@ main (int argc, char *argv[])
+@@ -1204,7 +1204,7 @@ main (int argc, char *argv[])
  	  ret = sqlite3_backup_finish (backup);
  	  sqlite3_close (handle);
  	  handle = disk_db_handle;
diff --git a/debian/patches/series b/debian/patches/series
index b96ee89..2308cf9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 00-add_automake_foreign.patch
 03-fix_typos.patch
-05-dont_relink.patch
+#05-dont_relink.patch

-- 
Spatialite Tools