[spatialite-tools] 07/10: Drop patches applied upstream, refresh remaining patches.
Bas Couwenberg
sebastic at xs4all.nl
Wed Nov 26 22:51:07 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch experimental
in repository spatialite-tools.
commit bc23bb4421fe88066a022b5007a867d0ca9fe6db
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Nov 26 23:02:12 2014 +0100
Drop patches applied upstream, refresh remaining patches.
---
debian/changelog | 1 +
debian/patches/00-add_automake_foreign.patch | 4 ++--
debian/patches/04-output-typo.patch | 15 ---------------
debian/patches/06-link-sqlite3.patch | 4 ++--
debian/patches/07-succesfully-typo.patch | 8 ++++----
debian/patches/09-default-typo.patch | 14 --------------
debian/patches/10-no-sqlite-check.patch | 2 +-
debian/patches/series | 2 --
8 files changed, 10 insertions(+), 40 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 75b5058..5a85660 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ spatialite-tools (4.2.1~rc1-1) UNRELEASED; urgency=medium
* New upstream release candidate.
* Set experimental branch in Vcs-Git and gbp.conf.
* Add man page for spatialite_osm_overpass & spatialite_xml_validator.
+ * Drop patches applied upstream, refresh remaining patches.
-- Bas Couwenberg <sebastic at xs4all.nl> Wed, 26 Nov 2014 21:39:05 +0100
diff --git a/debian/patches/00-add_automake_foreign.patch b/debian/patches/00-add_automake_foreign.patch
index dd9ca18..482a921 100644
--- a/debian/patches/00-add_automake_foreign.patch
+++ b/debian/patches/00-add_automake_foreign.patch
@@ -10,7 +10,7 @@ Forwarded: no
--- a/Makefile.am
+++ b/Makefile.am
-@@ -76,5 +76,5 @@ EXTRA_DIST = makefile.vc nmake.opt \
+@@ -85,5 +85,5 @@ EXTRA_DIST = makefile.vc nmake.opt \
Makefile-static-Linux \
Makefile-static-MacOsX
@@ -19,7 +19,7 @@ Forwarded: no
--- a/Makefile.in
+++ b/Makefile.in
-@@ -463,7 +463,7 @@ EXTRA_DIST = makefile.vc nmake.opt \
+@@ -490,7 +490,7 @@ EXTRA_DIST = makefile.vc nmake.opt \
Makefile-static-Linux \
Makefile-static-MacOsX
diff --git a/debian/patches/04-output-typo.patch b/debian/patches/04-output-typo.patch
deleted file mode 100644
index dc9b4ff..0000000
--- a/debian/patches/04-output-typo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix 'OUUPUT' typo, replace with 'OUTPUT'.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: https://groups.google.com/d/msg/spatialite-users/qQMFZYvW7wo/2do2QCXwyjkJ
-
---- a/spatialite_xml_print.c
-+++ b/spatialite_xml_print.c
-@@ -926,7 +926,7 @@ do_help ()
- fprintf (stderr,
- "-d or --db-path pathname the SpatiaLite DB [INPUT] path\n\n");
- fprintf (stderr,
-- "-x or --xml-path pathname the XML file [OUUPUT] path\n");
-+ "-x or --xml-path pathname the XML file [OUTPUT] path\n");
- fprintf (stderr,
- "-cs or --cache-size num DB cache size (how many pages)\n");
- fprintf (stderr,
diff --git a/debian/patches/06-link-sqlite3.patch b/debian/patches/06-link-sqlite3.patch
index 6733a99..2a4365d 100644
--- a/debian/patches/06-link-sqlite3.patch
+++ b/debian/patches/06-link-sqlite3.patch
@@ -4,7 +4,7 @@ Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713644
Last-Update: 2013-09-30
--- a/configure.ac
+++ b/configure.ac
-@@ -65,6 +65,8 @@ AC_CHECK_HEADERS(stddef.h,, [AC_MSG_ERRO
+@@ -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])])
@@ -13,7 +13,7 @@ Last-Update: 2013-09-30
# Checks for programs.
AC_PROG_CXX
-@@ -92,6 +94,9 @@ AC_FUNC_STAT
+@@ -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])
diff --git a/debian/patches/07-succesfully-typo.patch b/debian/patches/07-succesfully-typo.patch
index b92f216..48d54d6 100644
--- a/debian/patches/07-succesfully-typo.patch
+++ b/debian/patches/07-succesfully-typo.patch
@@ -3,7 +3,7 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
Last-Update: 2013-09-30
--- a/shell.c
+++ b/shell.c
-@@ -2718,7 +2718,7 @@ static int do_meta_command(char *zLine,
+@@ -2740,7 +2740,7 @@ static int do_meta_command(char *zLine,
}
else
fprintf (stderr, "Unable to parse: %s\n", dxf_path);
@@ -12,7 +12,7 @@ Last-Update: 2013-09-30
stop_dxf:
/* destroying the DXF parser */
gaiaDestroyDxfParser (dxf);
-@@ -2843,7 +2843,7 @@ stop_dxf:
+@@ -2865,7 +2865,7 @@ stop_dxf:
{
int cnt1 = sqlite3_total_changes(p->db);
if (cnt1 > cnt0)
@@ -34,7 +34,7 @@ Last-Update: 2013-09-30
/* memory cleanup */
--- a/spatialite_xml_collapse.c
+++ b/spatialite_xml_collapse.c
-@@ -2400,7 +2400,7 @@ main (int argc, char *argv[])
+@@ -2409,7 +2409,7 @@ main (int argc, char *argv[])
ret = sqlite3_backup_finish (backup);
sqlite3_close (handle);
handle = disk_db_handle;
@@ -45,7 +45,7 @@ Last-Update: 2013-09-30
spatialite_cleanup_ex (cache);
--- a/spatialite_xml_load.c
+++ b/spatialite_xml_load.c
-@@ -2828,7 +2828,7 @@ main (int argc, char *argv[])
+@@ -2837,7 +2837,7 @@ main (int argc, char *argv[])
ret = sqlite3_backup_finish (backup);
sqlite3_close (handle);
handle = disk_db_handle;
diff --git a/debian/patches/09-default-typo.patch b/debian/patches/09-default-typo.patch
deleted file mode 100644
index fd76d90..0000000
--- a/debian/patches/09-default-typo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Fix 'defualt' typo, replace with 'default'.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Last-Update: 2013-09-30
---- a/spatialite_network.c
-+++ b/spatialite_network.c
-@@ -1853,7 +1853,7 @@ do_help ()
- fprintf (stderr,
- " if omitted, GLength(g)\n");
- fprintf (stderr,
-- " will be used by defualt\n\n");
-+ " will be used by default\n\n");
- fprintf (stderr, "you can specify the following options as well:\n");
- fprintf (stderr, "----------------------------------------------\n");
- fprintf (stderr, "--a-star-supported *default*\n");
diff --git a/debian/patches/10-no-sqlite-check.patch b/debian/patches/10-no-sqlite-check.patch
index 81975af..f925135 100644
--- a/debian/patches/10-no-sqlite-check.patch
+++ b/debian/patches/10-no-sqlite-check.patch
@@ -7,7 +7,7 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
Bug-Debian: https://bugs.debian.org/743999
--- a/shell.c
+++ b/shell.c
-@@ -4186,11 +4186,13 @@ int main(int argc, char **argv){
+@@ -4192,11 +4192,13 @@ int main(int argc, char **argv){
/* initializing the SpatiaLite's internal cache */
splite_cache = spatialite_alloc_connection ();
diff --git a/debian/patches/series b/debian/patches/series
index 7182b7d..259bea2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,7 @@
00-add_automake_foreign.patch
03-fix_typos.patch
-04-output-typo.patch
#05-dont_relink.patch
06-link-sqlite3.patch
07-succesfully-typo.patch
08-indifferently-typo.patch
-09-default-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
More information about the Pkg-grass-devel
mailing list