[SCM] spatialite-tools branch, master, updated. debian/3.1.0b-1-9-gc1684ec

[David Paleino]

The following commit has been merged in the master branch:
commit 0e825483694a43373ae28527c9c1a0e65d13a554
Author: David Paleino <dapal at debian.org>
Date:   Sat Dec 1 20:51:35 2012 +0100

    Patches refreshed

diff --git a/debian/patches/00-add_automake_foreign.patch b/debian/patches/00-add_automake_foreign.patch
index c4cd633..650e240 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
-@@ -45,5 +45,5 @@ EXTRA_DIST = makefile.vc nmake.opt \
+@@ -60,5 +60,5 @@ EXTRA_DIST = makefile.vc nmake.opt \
  	Makefile-static-Linux \
  	Makefile-static-MacOsX
  
@@ -19,7 +19,7 @@ Forwarded: no
  
 --- spatialite-tools.orig/Makefile.in
 +++ spatialite-tools/Makefile.in
-@@ -300,7 +300,7 @@ EXTRA_DIST = makefile.vc nmake.opt \
+@@ -352,7 +352,7 @@ EXTRA_DIST = makefile.vc nmake.opt \
  	Makefile-static-Linux \
  	Makefile-static-MacOsX
  
diff --git a/debian/patches/03-fix_typos.patch b/debian/patches/03-fix_typos.patch
index 18625de..897f3e8 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
-@@ -1921,7 +1921,7 @@ main (int argc, char *argv[])
+@@ -1931,7 +1931,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
-@@ -1976,7 +1976,7 @@ db_vacuum (sqlite3 * db_handle)
+@@ -1980,7 +1980,7 @@ db_vacuum (sqlite3 * db_handle)
  	  sqlite3_free (sql_err);
  	  return;
        }
@@ -32,7 +32,7 @@ Forwarded: no
  }
  
  static void
-@@ -2810,7 +2810,7 @@ main (int argc, char *argv[])
+@@ -2820,7 +2820,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
-@@ -1326,7 +1326,7 @@ create_qualified_nodes (struct aux_param
+@@ -1330,7 +1330,7 @@ create_qualified_nodes (struct aux_param
  	  fprintf (stderr, "COMMIT TRANSACTION error: %s\n", sql_err);
  	  sqlite3_free (sql_err);
        }
@@ -52,7 +52,7 @@ Forwarded: no
      return 1;
    error:
      if (query_stmt != NULL)
-@@ -1746,7 +1746,7 @@ db_vacuum (sqlite3 * handle)
+@@ -1757,7 +1757,7 @@ db_vacuum (sqlite3 * handle)
  	  sqlite3_free (sql_err);
  	  return;
        }
@@ -61,7 +61,7 @@ Forwarded: no
  }
  
  static int
-@@ -2466,7 +2466,7 @@ main (int argc, char *argv[])
+@@ -2477,7 +2477,7 @@ main (int argc, char *argv[])
  		error = 1;
  	    }
  	  if (print_template (template_path, railways))
@@ -70,7 +70,7 @@ Forwarded: no
  		      template_path);
  	  return 0;
        }
-@@ -2503,7 +2503,7 @@ main (int argc, char *argv[])
+@@ -2514,7 +2514,7 @@ main (int argc, char *argv[])
  		error = 1;
  	    }
  	  if (parse_template (&params, template_path))
@@ -79,7 +79,7 @@ Forwarded: no
  		      template_path);
  	  else
  	      return -1;
-@@ -2721,7 +2721,7 @@ main (int argc, char *argv[])
+@@ -2732,7 +2732,7 @@ main (int argc, char *argv[])
  	  ret = sqlite3_backup_finish (backup);
  	  sqlite3_close (handle);
  	  handle = disk_handle;
@@ -90,7 +90,7 @@ Forwarded: no
      db_vacuum (handle);
 --- spatialite-tools.orig/spatialite_osm_raw.c
 +++ spatialite-tools/spatialite_osm_raw.c
-@@ -1204,7 +1204,7 @@ main (int argc, char *argv[])
+@@ -1214,7 +1214,7 @@ main (int argc, char *argv[])
  	  ret = sqlite3_backup_finish (backup);
  	  sqlite3_close (handle);
  	  handle = disk_db_handle;

-- 
Spatialite Tools