The following commit has been merged in the master branch:
commit a8248c4410b3d55a139cbe34d8a9bae691df0085
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Mon Sep 30 02:44:51 2013 +0200
Refresh patches.
diff --git a/debian/patches/00-add_automake_foreign.patch
b/debian/patches/00-add_automake_foreign.patch
index 650e240..c3e0df4 100644
--- a/debian/patches/00-add_automake_foreign.patch
+++ b/debian/patches/00-add_automake_foreign.patch
@@ -8,18 +8,18 @@ Forwarded: no
Makefile.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---- spatialite-tools.orig/Makefile.am
-+++ spatialite-tools/Makefile.am
-@@ -60,5 +60,5 @@ EXTRA_DIST = makefile.vc nmake.opt \
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -63,5 +63,5 @@ EXTRA_DIST = makefile.vc nmake.opt \
Makefile-static-Linux \
Makefile-static-MacOsX
-AUTOMAKE_OPTIONS = dist-zip
+AUTOMAKE_OPTIONS = dist-zip foreign
---- spatialite-tools.orig/Makefile.in
-+++ spatialite-tools/Makefile.in
-@@ -352,7 +352,7 @@ EXTRA_DIST = makefile.vc nmake.opt \
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -362,7 +362,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 4290640..f5c11f6 100644
--- a/debian/patches/03-fix_typos.patch
+++ b/debian/patches/03-fix_typos.patch
@@ -12,9 +12,9 @@ Forwarded: no
spatialite_osm_raw.c | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
---- spatialite-tools.orig/spatialite_gml.c
-+++ spatialite-tools/spatialite_gml.c
-@@ -1931,7 +1931,7 @@ main (int argc, char *argv[])
+--- a/spatialite_gml.c
++++ b/spatialite_gml.c
+@@ -1936,7 +1936,7 @@ main (int argc, char *argv[])
ret = sqlite3_backup_finish (backup);
sqlite3_close (handle);
handle = disk_db_handle;
@@ -23,8 +23,8 @@ Forwarded: no
}
sqlite3_close (handle);
---- spatialite-tools.orig/spatialite_osm_map.c
-+++ spatialite-tools/spatialite_osm_map.c
+--- a/spatialite_osm_map.c
++++ b/spatialite_osm_map.c
@@ -1980,7 +1980,7 @@ db_vacuum (sqlite3 * db_handle)
sqlite3_free (sql_err);
return;
@@ -34,7 +34,7 @@ Forwarded: no
}
static void
-@@ -2820,7 +2820,7 @@ main (int argc, char *argv[])
+@@ -2825,7 +2825,7 @@ main (int argc, char *argv[])
ret = sqlite3_backup_finish (backup);
sqlite3_close (handle);
handle = disk_db_handle;
@@ -43,8 +43,8 @@ Forwarded: no
}
/* VACUUMing */
---- spatialite-tools.orig/spatialite_osm_net.c
-+++ spatialite-tools/spatialite_osm_net.c
+--- a/spatialite_osm_net.c
++++ b/spatialite_osm_net.c
@@ -1330,7 +1330,7 @@ create_qualified_nodes (struct aux_param
fprintf (stderr, "COMMIT TRANSACTION error: %s\n", sql_err);
sqlite3_free (sql_err);
@@ -54,7 +54,7 @@ Forwarded: no
return 1;
error:
if (query_stmt != NULL)
-@@ -1757,7 +1757,7 @@ db_vacuum (sqlite3 * handle)
+@@ -1759,7 +1759,7 @@ db_vacuum (sqlite3 * handle)
sqlite3_free (sql_err);
return;
}
@@ -63,7 +63,7 @@ Forwarded: no
}
static int
-@@ -2477,7 +2477,7 @@ main (int argc, char *argv[])
+@@ -2481,7 +2481,7 @@ main (int argc, char *argv[])
error = 1;
}
if (print_template (template_path, railways))
@@ -72,7 +72,7 @@ Forwarded: no
template_path);
return 0;
}
-@@ -2514,7 +2514,7 @@ main (int argc, char *argv[])
+@@ -2518,7 +2518,7 @@ main (int argc, char *argv[])
error = 1;
}
if (parse_template (¶ms, template_path))
@@ -81,7 +81,7 @@ Forwarded: no
template_path);
else
return -1;
-@@ -2732,7 +2732,7 @@ main (int argc, char *argv[])
+@@ -2740,7 +2740,7 @@ main (int argc, char *argv[])
ret = sqlite3_backup_finish (backup);
sqlite3_close (handle);
handle = disk_handle;
@@ -90,9 +90,9 @@ Forwarded: no
}
/* VACUUMing */
db_vacuum (handle);
---- spatialite-tools.orig/spatialite_osm_raw.c
-+++ spatialite-tools/spatialite_osm_raw.c
-@@ -1214,7 +1214,7 @@ main (int argc, char *argv[])
+--- a/spatialite_osm_raw.c
++++ b/spatialite_osm_raw.c
+@@ -1219,7 +1219,7 @@ main (int argc, char *argv[])
ret = sqlite3_backup_finish (backup);
sqlite3_close (handle);
handle = disk_db_handle;
@@ -101,9 +101,9 @@ Forwarded: no
}
/* closing the DB connection */
---- spatialite-tools.orig/shell.c
-+++ spatialite-tools/shell.c
-@@ -2579,7 +2579,7 @@ static int do_meta_command(char *zLine,
+--- a/shell.c
++++ b/shell.c
+@@ -2787,7 +2787,7 @@ stop_dxf:
{
int cnt1 = sqlite3_total_changes(p->db);
if (cnt1 > cnt0)
@@ -112,9 +112,9 @@ Forwarded: no
else
fprintf(stderr, "SpatialTable \"%s\" seems not to exist\n",
azArg[1]);
}
---- spatialite-tools.orig/spatialite_convert.c
-+++ spatialite-tools/spatialite_convert.c
-@@ -7025,7 +7025,7 @@ main (int argc, char *argv[])
+--- a/spatialite_convert.c
++++ b/spatialite_convert.c
+@@ -7018,7 +7018,7 @@ main (int argc, char *argv[])
sqlite3_free (sql_err);
goto stop;
}
--
Spatialite Tools
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
