This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental
in repository spatialite-tools.

commit f72fa8e67af6db67d891fe9dd7ccafa82f1b14de
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Fri Jun 19 21:22:36 2015 +0200

    Drop patches applied upstream, refresh remaining patches.
---
 debian/changelog                             |   1 +
 debian/patches/00-add_automake_foreign.patch |   2 +-
 debian/patches/03-fix_typos.patch            | 114 ---------------------------
 debian/patches/06-link-sqlite3.patch         |  25 ------
 debian/patches/07-succesfully-typo.patch     |  68 ----------------
 debian/patches/08-indifferently-typo.patch   |  37 ---------
 debian/patches/series                        |   4 -
 7 files changed, 2 insertions(+), 249 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d6c56e0..5a3781f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ spatialite-tools (4.3.0~rc0-1) UNRELEASED; urgency=medium
 
   * Update watch file to use lowercase rc in upstream version mangle.
   * New upstream release candidate.
+  * Drop patches applied upstream, refresh remaining patches.
 
  -- Bas Couwenberg <sebas...@debian.org>  Fri, 19 Jun 2015 03:26:14 +0200
 
diff --git a/debian/patches/00-add_automake_foreign.patch 
b/debian/patches/00-add_automake_foreign.patch
index 482a921..5bb630f 100644
--- a/debian/patches/00-add_automake_foreign.patch
+++ b/debian/patches/00-add_automake_foreign.patch
@@ -19,7 +19,7 @@ Forwarded: no
  
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -490,7 +490,7 @@ EXTRA_DIST = makefile.vc nmake.opt \
+@@ -500,7 +500,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
deleted file mode 100644
index a382a8d..0000000
--- a/debian/patches/03-fix_typos.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From: David Paleino <da...@debian.org>
-Subject: fix typos in source code
-Origin: vendor
-Forwarded: 
https://groups.google.com/d/msg/spatialite-users/yvME7fp-7EI/YM7rYHlEvssJ
-
----
- shell.c              |    2 +-
- spatialite_convert.c |    2 +-
- spatialite_gml.c     |    2 +-
- spatialite_osm_map.c |    4 ++--
- spatialite_osm_net.c |   10 +++++-----
- spatialite_osm_raw.c |    2 +-
- 6 files changed, 11 insertions(+), 11 deletions(-)
-
---- 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;
--        printf ("\tIN_MEMORY database succesfully exported\n");
-+        printf ("\tIN_MEMORY database successfully exported\n");
-       }
- 
-     sqlite3_close (handle);
---- a/spatialite_osm_map.c
-+++ b/spatialite_osm_map.c
-@@ -1990,7 +1990,7 @@ db_vacuum (sqlite3 * db_handle)
-         sqlite3_free (sql_err);
-         return;
-       }
--    printf ("\tAll done: OSM map was succesfully loaded\n");
-+    printf ("\tAll done: OSM map was successfully loaded\n");
- }
- 
- static void
-@@ -2835,7 +2835,7 @@ main (int argc, char *argv[])
-         ret = sqlite3_backup_finish (backup);
-         sqlite3_close (handle);
-         handle = disk_db_handle;
--        printf ("\tIN_MEMORY database succesfully exported\n");
-+        printf ("\tIN_MEMORY database successfully exported\n");
-       }
- 
- /* VACUUMing */
---- 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);
-       }
--    printf ("\tHelper table '%s_nodes' succesfully created\n", table);
-+    printf ("\tHelper table '%s_nodes' successfully created\n", table);
-     return 1;
-   error:
-     if (query_stmt != NULL)
-@@ -1759,7 +1759,7 @@ db_vacuum (sqlite3 * handle)
-         sqlite3_free (sql_err);
-         return;
-       }
--    printf ("\tAll done: OSM graph was succesfully loaded\n");
-+    printf ("\tAll done: OSM graph was successfully loaded\n");
- }
- 
- static int
-@@ -2481,7 +2481,7 @@ main (int argc, char *argv[])
-               error = 1;
-           }
-         if (print_template (template_path, railways))
--            printf ("template-file \"%s\" succesfully created\n\n",
-+            printf ("template-file \"%s\" successfully created\n\n",
-                     template_path);
-         return 0;
-       }
-@@ -2518,7 +2518,7 @@ main (int argc, char *argv[])
-               error = 1;
-           }
-         if (parse_template (&params, template_path))
--            printf ("template-file \"%s\" succesfully acquired\n\n",
-+            printf ("template-file \"%s\" successfully acquired\n\n",
-                     template_path);
-         else
-             return -1;
-@@ -2740,7 +2740,7 @@ main (int argc, char *argv[])
-         ret = sqlite3_backup_finish (backup);
-         sqlite3_close (handle);
-         handle = disk_handle;
--        printf ("\tIN_MEMORY database succesfully exported\n");
-+        printf ("\tIN_MEMORY database successfully exported\n");
-       }
- /* VACUUMing */
-     db_vacuum (handle);
---- 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;
--        printf ("\tIN_MEMORY database succesfully exported\n");
-+        printf ("\tIN_MEMORY database successfully exported\n");
-       }
- 
- /* closing the DB connection */
---- a/spatialite_convert.c
-+++ b/spatialite_convert.c
-@@ -7056,7 +7056,7 @@ main (int argc, char *argv[])
-         sqlite3_free (sql_err);
-         goto stop;
-       }
--    printf ("\tDB-file succesfully converted !!!\n\n");
-+    printf ("\tDB-file successfully converted !!!\n\n");
-     goto end;
- 
- /* closing the DB */
diff --git a/debian/patches/06-link-sqlite3.patch 
b/debian/patches/06-link-sqlite3.patch
deleted file mode 100644
index adf68e0..0000000
--- a/debian/patches/06-link-sqlite3.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Link to sqlite3 library.
-Author: Bas Couwenberg <sebas...@debian.org>
-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713644
-Last-Update: 2013-09-30
---- a/configure.ac
-+++ b/configure.ac
-@@ -67,6 +67,8 @@ AC_CHECK_HEADERS(stddef.h,, [AC_MSG_ERRO
- AC_CHECK_HEADERS(stdint.h,, [AC_MSG_ERROR([cannot find stdint.h, bailing 
out])])
- AC_CHECK_HEADERS(sys/time.h,, [AC_MSG_ERROR([cannot find sys/time.h, bailing 
out])])
- AC_CHECK_HEADERS(unistd.h,, [AC_MSG_ERROR([cannot find unistd.h, bailing 
out])])
-+AC_CHECK_HEADERS(sqlite3.h,, [AC_MSG_ERROR([cannot find sqlite3.h, bailing 
out])])
-+AC_CHECK_HEADERS(sqlite3ext.h,, [AC_MSG_ERROR([cannot find sqlite3ext.h, 
bailing out])])
- 
- # Checks for programs.
- AC_PROG_CXX
-@@ -94,6 +96,9 @@ AC_FUNC_STAT
- AC_FUNC_STRFTIME
- AC_CHECK_FUNCS([memset sqrt strcasecmp strerror strncasecmp strstr fdatasync 
ftruncate getcwd gettimeofday localtime_r memmove strerror])
- 
-+# Checks for installed libraries
-+AC_CHECK_LIB(sqlite3,sqlite3_prepare_v2,,AC_MSG_ERROR(['libsqlite3' is 
required but it doesn't seem to be installed on this system.]),-lm)
-+
- AC_CONFIG_FILES([Makefile])
- 
- #-----------------------------------------------------------------------
diff --git a/debian/patches/07-succesfully-typo.patch 
b/debian/patches/07-succesfully-typo.patch
deleted file mode 100644
index 10c3c51..0000000
--- a/debian/patches/07-succesfully-typo.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Description: Fix 'succesfully typo, replace with 'successfully'.
-Author: Bas Couwenberg <sebas...@debian.org>
-Forwarded: 
https://groups.google.com/d/msg/spatialite-users/yvME7fp-7EI/YM7rYHlEvssJ
-Last-Update: 2014-11-26
---- a/shell.c
-+++ b/shell.c
-@@ -2740,7 +2740,7 @@ static int do_meta_command(char *zLine,
-           }
-           else
-               fprintf (stderr, "Unable to parse: %s\n", dxf_path);
--          fprintf(stderr, "\n*** DXF file succesfully loaded\n"); 
-+          fprintf(stderr, "\n*** DXF file successfully loaded\n"); 
- stop_dxf:
-       /* destroying the DXF parser */
-           gaiaDestroyDxfParser (dxf);
-@@ -2865,7 +2865,7 @@ stop_dxf:
-           {
-               int cnt1 = sqlite3_total_changes(p->db);
-               if (cnt1 > cnt0)
--                  fprintf(stderr, "SpatialTable %s succesfully removed\n", 
azArg[1]);
-+                  fprintf(stderr, "SpatialTable %s successfully removed\n", 
azArg[1]);
-               else
-                   fprintf(stderr, "SpatialTable %s seems not to exist\n", 
azArg[1]);
-           }
---- a/spatialite_dxf.c
-+++ b/spatialite_dxf.c
-@@ -528,7 +528,7 @@ main (int argc, char *argv[])
-         ret = sqlite3_backup_finish (backup);
-         sqlite3_close (handle);
-         handle = disk_handle;
--        printf ("\tIN_MEMORY database succesfully exported\n");
-+        printf ("\tIN_MEMORY database successfully exported\n");
-       }
- 
- /* memory cleanup */
---- a/spatialite_xml_collapse.c
-+++ b/spatialite_xml_collapse.c
-@@ -2409,7 +2409,7 @@ main (int argc, char *argv[])
-         ret = sqlite3_backup_finish (backup);
-         sqlite3_close (handle);
-         handle = disk_db_handle;
--        printf ("\tIN_MEMORY database succesfully exported\n");
-+        printf ("\tIN_MEMORY database successfully exported\n");
-       }
-     sqlite3_close (handle);
-     spatialite_cleanup_ex (cache);
---- a/spatialite_xml_load.c
-+++ b/spatialite_xml_load.c
-@@ -2837,7 +2837,7 @@ main (int argc, char *argv[])
-         ret = sqlite3_backup_finish (backup);
-         sqlite3_close (handle);
-         handle = disk_db_handle;
--        printf ("\tIN_MEMORY database succesfully exported\n");
-+        printf ("\tIN_MEMORY database successfully exported\n");
-       }
- 
-     sqlite3_close (handle);
---- a/spatialite_osm_overpass.c
-+++ b/spatialite_osm_overpass.c
-@@ -4579,7 +4579,7 @@ main (int argc, char *argv[])
-         ret = sqlite3_backup_finish (backup);
-         sqlite3_close (handle);
-         handle = disk_db_handle;
--        printf ("\tIN_MEMORY database succesfully exported\n");
-+        printf ("\tIN_MEMORY database successfully exported\n");
-       }
- 
- /* closing the DB connection */
diff --git a/debian/patches/08-indifferently-typo.patch 
b/debian/patches/08-indifferently-typo.patch
deleted file mode 100644
index f136e9c..0000000
--- a/debian/patches/08-indifferently-typo.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Fix 'indifferenctly' typo, replace with 'indifferently'.
-Author: Bas Couwenberg <sebas...@debian.org>
-Forwarded: 
https://groups.google.com/d/msg/spatialite-users/yvME7fp-7EI/YM7rYHlEvssJ
-Last-Update: 2014-11-26
---- a/spatialite_osm_map.c
-+++ b/spatialite_osm_map.c
-@@ -2558,7 +2558,7 @@ do_help ()
-     fprintf (stderr,
-            "                 both OSM-XML (*.osm) and OSM-ProtoBuf\n");
-     fprintf (stderr,
--           "                 (*.osm.pbf) are indifferenctly supported.\n\n");
-+           "                 (*.osm.pbf) are indifferently supported.\n\n");
-     fprintf (stderr,
-            "-d or --db-path  pathname       the SpatiaLite DB path\n\n");
-     fprintf (stderr, "you can specify the following options as well\n");
---- a/spatialite_osm_net.c
-+++ b/spatialite_osm_net.c
-@@ -2255,7 +2255,7 @@ do_help ()
-     fprintf (stderr,
-            "                 both OSM-XML (*.osm) and OSM-ProtoBuf\n");
-     fprintf (stderr,
--           "                 (*.osm.pbf) are indifferenctly supported.\n\n");
-+           "                 (*.osm.pbf) are indifferently supported.\n\n");
-     fprintf (stderr,
-            "-d or --db-path  pathname       the SpatiaLite DB path\n");
-     fprintf (stderr,
---- a/spatialite_osm_raw.c
-+++ b/spatialite_osm_raw.c
-@@ -947,7 +947,7 @@ do_help ()
-     fprintf (stderr,
-            "                 both OSM-XML (*.osm) and OSM-ProtoBuf\n");
-     fprintf (stderr,
--           "                 (*.osm.pbf) are indifferenctly supported.\n\n");
-+           "                 (*.osm.pbf) are indifferently supported.\n\n");
-     fprintf (stderr,
-            "-d or --db-path  pathname       the SpatiaLite DB path\n\n");
-     fprintf (stderr, "you can specify the following options as well\n");
diff --git a/debian/patches/series b/debian/patches/series
index 259bea2..0296e66 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,3 @@
 00-add_automake_foreign.patch
-03-fix_typos.patch
 #05-dont_relink.patch
-06-link-sqlite3.patch
-07-succesfully-typo.patch
-08-indifferently-typo.patch
 10-no-sqlite-check.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/spatialite-tools.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to