[spatialite] 05/13: Drop patches applied upstream, refresh remaining patches.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Jun 19 19:18:16 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository spatialite.
commit 8b433e71d0bc11db1de359abd8835fc31604cdc0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Jun 19 16:00:56 2015 +0200
Drop patches applied upstream, refresh remaining patches.
---
debian/changelog | 1 +
debian/patches/00-add_automake_foreign.patch | 10 +--
debian/patches/10-automake-subdir-objects.patch | 12 ----
debian/patches/11-link-libxml2.patch | 2 +-
debian/patches/12-link-pthread.patch | 4 +-
debian/patches/13-succesfully-typo.patch | 87 -------------------------
debian/patches/14-soversion.patch | 36 ----------
debian/patches/series | 3 -
8 files changed, 9 insertions(+), 146 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 46e3eec..e071680 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ spatialite (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 <sebastic at debian.org> Fri, 19 Jun 2015 03:20:11 +0200
diff --git a/debian/patches/00-add_automake_foreign.patch b/debian/patches/00-add_automake_foreign.patch
index e9bce25..30ef354 100644
--- a/debian/patches/00-add_automake_foreign.patch
+++ b/debian/patches/00-add_automake_foreign.patch
@@ -16,16 +16,16 @@ Forwarded: no
-AUTOMAKE_OPTIONS = dist-zip
+AUTOMAKE_OPTIONS = dist-zip foreign
- EXTRA_DIST = makefile.vc nmake.opt Android.mk Android_4.2.0.mk \
- spatialite-4.2.0.mk mainpage.doxy README.coverage \
+ EXTRA_DIST = makefile.vc nmake.opt Android.mk Android_4.3.0.mk \
+ spatialite-4.3.0.mk mainpage.doxy README.coverage \
--- a/Makefile.in
+++ b/Makefile.in
-@@ -355,7 +355,7 @@ top_build_prefix = @top_build_prefix@
+@@ -366,7 +366,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = dist-zip
+AUTOMAKE_OPTIONS = dist-zip foreign
- EXTRA_DIST = makefile.vc nmake.opt Android.mk Android_4.2.0.mk \
- spatialite-4.2.0.mk mainpage.doxy README.coverage \
+ EXTRA_DIST = makefile.vc nmake.opt Android.mk Android_4.3.0.mk \
+ spatialite-4.3.0.mk mainpage.doxy README.coverage \
spatialite-sql-latest.html config-msvc.h
diff --git a/debian/patches/10-automake-subdir-objects.patch b/debian/patches/10-automake-subdir-objects.patch
deleted file mode 100644
index 0c1d0f7..0000000
--- a/debian/patches/10-automake-subdir-objects.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Description: Set automake option subdir-object to remain forward compatible.
-Author: Bas Couwenberg <sebastic at debian.org>
-Last-Update: 2013-09-30
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,4 +1,6 @@
-
-+AUTOMAKE_OPTIONS = subdir-objects
-+
- SUBDIRS = headers \
- gaiaaux \
- gaiaexif \
diff --git a/debian/patches/11-link-libxml2.patch b/debian/patches/11-link-libxml2.patch
index 548af8b..2ff6ec6 100644
--- a/debian/patches/11-link-libxml2.patch
+++ b/debian/patches/11-link-libxml2.patch
@@ -3,7 +3,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
Last-Update: 2013-12-14
--- a/test/Makefile.am
+++ b/test/Makefile.am
-@@ -87,7 +87,7 @@ check_PROGRAMS += \
+@@ -89,7 +89,7 @@ check_PROGRAMS += \
endif
AM_CFLAGS = -I at srcdir@/../src/headers -I at srcdir@
diff --git a/debian/patches/12-link-pthread.patch b/debian/patches/12-link-pthread.patch
index 8aa3095..f30d44c 100644
--- a/debian/patches/12-link-pthread.patch
+++ b/debian/patches/12-link-pthread.patch
@@ -2,7 +2,7 @@ Description: Link libpthread to fix check_multithread build failure
Author: Bas Couwenberg <sebastic at debian.org>
--- a/test/Makefile.am
+++ b/test/Makefile.am
-@@ -87,7 +87,7 @@ check_PROGRAMS += \
+@@ -89,7 +89,7 @@ check_PROGRAMS += \
endif
AM_CFLAGS = -I at srcdir@/../src/headers -I at srcdir@
@@ -13,7 +13,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
--- a/test/Makefile.in
+++ b/test/Makefile.in
-@@ -972,7 +972,7 @@ top_builddir = @top_builddir@
+@@ -996,7 +996,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = @CFLAGS@ @GEOS_CFLAGS@ @LIBXML2_CFLAGS@
AM_CFLAGS = -I at srcdir@/../src/headers -I at srcdir@
diff --git a/debian/patches/13-succesfully-typo.patch b/debian/patches/13-succesfully-typo.patch
deleted file mode 100644
index 08d709b..0000000
--- a/debian/patches/13-succesfully-typo.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Description: Fix 'succesfully' typo, replace with 'successfully'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://groups.google.com/d/msg/spatialite-users/yvME7fp-7EI/OiRiDJioEjEJ
-Applied-Upstream: https://www.gaia-gis.it/fossil/libspatialite/vinfo/497f33bd73
-
---- a/src/gaiageo/gg_xml.c
-+++ b/src/gaiageo/gg_xml.c
-@@ -2942,7 +2942,7 @@ gaiaIsCompressedXmlBlob (const unsigned
- GAIAGEO_DECLARE int
- gaiaIsSchemaValidatedXmlBlob (const unsigned char *blob, int blob_size)
- {
--/* Checks if a valid XmlBLOB buffer has succesfully passed a formal Schema validation or not */
-+/* Checks if a valid XmlBLOB buffer has successfully passed a formal Schema validation or not */
- int validated = 0;
- unsigned char flag;
-
---- a/src/headers/spatialite/gaiaaux.h
-+++ b/src/headers/spatialite/gaiaaux.h
-@@ -285,7 +285,7 @@ extern "C"
- \param sqlite handle of the current DB connection
- \param sqllog_pk the Primary Key identifying the corresponding Log event.
- \n expected to be exactely the same returned by the most recent call to gaiaInsertIntoSqlLog()
-- \param success expected to be TRUE if the SQL statement was succesfully executed.
-+ \param success expected to be TRUE if the SQL statement was successfully executed.
- \param errMsg expected to be the error message returned by SQLite on failure, NULL on success.
-
- \sa gaiaInsertIntoSqlLog
---- a/src/headers/spatialite/gg_xml.h
-+++ b/src/headers/spatialite/gg_xml.h
-@@ -133,7 +133,7 @@ extern "C"
- \param xml_len lenght of the XML document (in bytes).
- \param compressed if TRUE the returned XmlBLOB will be zip-compressed.
- \param schemaURI if not NULL the XML document will be assumed to be valid
-- only if it succesfully passes a formal Schema valitadion.
-+ only if it successfully passes a formal Schema valitadion.
- \param result on completion will containt a pointer to XmlBLOB:
- NULL on failure.
- \param size on completion this variable will contain the XmlBLOB's size (in bytes)
-@@ -342,7 +342,7 @@ extern "C"
- int *out_size);
-
- /**
-- Checks if a valid XmlBLOB buffer has succesfully passed a formal Schema validation or not
-+ Checks if a valid XmlBLOB buffer has successfully passed a formal Schema validation or not
-
- \param blob pointer to the XmlBLOB buffer.
- \param size XmlBLOB's size (in bytes).
---- a/src/shapefiles/validator.c
-+++ b/src/shapefiles/validator.c
-@@ -2300,7 +2300,7 @@ sanitize_geometry_column_common (const v
- else if (report->n_repaired > 0)
- {
- fprintf (out,
-- "\t\t\t<tr><td colspan=\"2\" class=\"ok\">This layer has been succesfully repaired and is now completely valid;<br>");
-+ "\t\t\t<tr><td colspan=\"2\" class=\"ok\">This layer has been successfully repaired and is now completely valid;<br>");
- fprintf (out,
- "doesn't require any further corrective action.</td></tr>\n");
- }
-@@ -2632,7 +2632,7 @@ sanitize_all_geometry_columns_common (co
- else if (n_discarded == 0 && n_failures == 0)
- {
- p_msg =
-- "NONE: this layer has been succesfully sanitized and is now fully valid";
-+ "NONE: this layer has been successfully sanitized and is now fully valid";
- cls_msg = "ok";
- }
- else if (n_discarded == 0 && n_failures > 0)
---- a/src/spatialite/spatialite.c
-+++ b/src/spatialite/spatialite.c
-@@ -26340,7 +26340,7 @@ load_dxf (sqlite3 * db_handle, struct sp
- spatialite_e ("Unable to parse: %s\n", filename);
- goto stop_dxf;
- }
-- spatialite_e ("\n*** DXF file succesfully loaded\n");
-+ spatialite_e ("\n*** DXF file successfully loaded\n");
- ret = 1;
-
- stop_dxf:
-@@ -28817,7 +28817,7 @@ fnct_XB_Create (sqlite3_context * contex
- /
- / - the XMLdocument should be "well formed"
- / - if *compressed* is TRUE (default) the XmlBlob would be zipped
--/ - if *SchemaURI* in not NULL then only XMLdocuments succesfully
-+/ - if *SchemaURI* in not NULL then only XMLdocuments successfully
- / passing a formal Schema Validation will be accepted as valid
- / - if *InternalSchamaURI* is defined (any numeric value) then an
- / attempt will be made in order to identify a SchemaURI defined
diff --git a/debian/patches/14-soversion.patch b/debian/patches/14-soversion.patch
deleted file mode 100644
index 748e2fd..0000000
--- a/debian/patches/14-soversion.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Bump current along with age to keep SOVERSION at 7.
- In 4.2.1-RC0 the libtool version-info was changed from 7:0:0 to 7:0:1,
- causing the SOVERSION to decrement from 7 to 6.
- SpatiaLite 4.2.1 only introduced symbols,
- for which a SOVERSION change is not required.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://groups.google.com/d/msg/spatialite-users/-MtzxMpdNFg/qwMwjLJjaPoJ
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -41,10 +41,10 @@ libspatialite_la_LDFLAGS = -version-info
- libspatialite_la_LIBADD += -lm
- else
- if ANDROID
--libspatialite_la_LDFLAGS = -version-info 7:0:1
-+libspatialite_la_LDFLAGS = -version-info 8:0:1
- libspatialite_la_LIBADD += -ldl -lm
- else
--libspatialite_la_LDFLAGS = -version-info 7:0:1
-+libspatialite_la_LDFLAGS = -version-info 8:0:1
- libspatialite_la_LIBADD += -lpthread -ldl -lm
- endif
- endif
-@@ -74,10 +74,10 @@ mod_spatialite_la_LDFLAGS = -module -avo
- mod_spatialite_la_LIBADD += -lm
- else
- if ANDROID
--mod_spatialite_la_LDFLAGS = -module -version-info 7:0:1
-+mod_spatialite_la_LDFLAGS = -module -version-info 8:0:1
- mod_spatialite_la_LIBADD += -ldl -lm
- else
--mod_spatialite_la_LDFLAGS = -module -version-info 7:0:1
-+mod_spatialite_la_LDFLAGS = -module -version-info 8:0:1
- mod_spatialite_la_LIBADD += -lpthread -ldl -lm
- endif
- endif
diff --git a/debian/patches/series b/debian/patches/series
index 68c7898..29ac31e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,4 @@
00-add_automake_foreign.patch
07-fix_spatialite_pc.patch
-10-automake-subdir-objects.patch
11-link-libxml2.patch
12-link-pthread.patch
-13-succesfully-typo.patch
-#14-soversion.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/spatialite.git
More information about the Pkg-grass-devel
mailing list