This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository spatialite.
commit fea81a1566e9e12271785ee26cac6dc664d5ce78 Author: Bas Couwenberg <[email protected]> Date: Tue Dec 15 20:48:17 2015 +0100 Drop patches, applied upstream. --- debian/changelog | 1 + debian/patches/liblwgeom-2.2.0.patch | 49 ------------------------------------ debian/patches/occurrence-typo.patch | 44 -------------------------------- debian/patches/series | 2 -- 4 files changed, 1 insertion(+), 95 deletions(-) diff --git a/debian/changelog b/debian/changelog index e592d57..18dbed0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ spatialite (4.4.0~rc0-1) UNRELEASED; urgency=medium * New upstream release candidate. + * Drop patches, applied upstream. -- Bas Couwenberg <[email protected]> Tue, 15 Dec 2015 20:43:30 +0100 diff --git a/debian/patches/liblwgeom-2.2.0.patch b/debian/patches/liblwgeom-2.2.0.patch deleted file mode 100644 index c10465c..0000000 --- a/debian/patches/liblwgeom-2.2.0.patch +++ /dev/null @@ -1,49 +0,0 @@ -Description: Switch from lw_vasprintf() to sqlite3_vmprintf(). - lw_vasprintf() was removed in liblwgeom 2.2.0. -Author: Alessandro Furieri <[email protected]> -Origin: https://www.gaia-gis.it/fossil/libspatialite/fdiff?v1=48918773ced633bc&v2=342a605d691bddc6&sbs=1 - https://www.gaia-gis.it/fossil/libspatialite/fdiff?v1=bae06cd7cce4c2c9&v2=6000f2931ddaf06d&sbs=1 -Bug-Debian: https://bugs.debian.org/807556 - ---- a/src/gaiageo/gg_lwgeom.c -+++ b/src/gaiageo/gg_lwgeom.c -@@ -90,29 +90,31 @@ splite_lwgeom_version (void) - static void - lwgaia_noticereporter (const char *fmt, va_list ap) - { -- char *msg; -- if (!lw_vasprintf (&msg, fmt, ap)) -+ char *msg = sqlite3_vmprintf (fmt, ap); -+ if (msg == NULL) - { - va_end (ap); - return; - } -- spatialite_e ("LWGEOM notice: %s\n", msg); -+ if (strlen (msg) > 1) -+ spatialite_e ("LWGEOM notice: %s\n", msg); - gaiaSetLwGeomWarningMsg (msg); -- free (msg); -+ sqlite3_free (msg); - } - - static void - lwgaia_errorreporter (const char *fmt, va_list ap) - { -- char *msg; -- if (!lw_vasprintf (&msg, fmt, ap)) -+ char *msg = sqlite3_vmprintf (fmt, ap); -+ if (msg == NULL) - { - va_end (ap); - return; - } -- spatialite_e ("LWGEOM error: %s\n", msg); -+ if (strlen (msg) > 1) -+ spatialite_e ("LWGEOM error: %s\n", msg); - gaiaSetLwGeomErrorMsg (msg); -- free (msg); -+ sqlite3_free (msg); - } - - #ifndef POSTGIS_2_1 diff --git a/debian/patches/occurrence-typo.patch b/debian/patches/occurrence-typo.patch deleted file mode 100644 index d9b1468..0000000 --- a/debian/patches/occurrence-typo.patch +++ /dev/null @@ -1,44 +0,0 @@ -Description: Fix 'occurence' typo, replace with 'occurrence'. -Author: Bas Couwenberg <[email protected]> -Forwarded: https://groups.google.com/d/msg/spatialite-users/L5StBh5nou0/rrc154fgDQAJ - ---- a/src/headers/spatialite.h -+++ b/src/headers/spatialite.h -@@ -711,7 +711,7 @@ extern "C" - - \sa check_duplicated_rows, remove_duplicated_rows_ex - -- \note when two (or more) duplicated rows exist, only the first occurence -+ \note when two (or more) duplicated rows exist, only the first occurrence - will be preserved, then deleting any further occurrence. - */ - SPATIALITE_DECLARE void remove_duplicated_rows (sqlite3 * sqlite, -@@ -727,7 +727,7 @@ extern "C" - - \sa check_duplicated_rows, remove_duplicated_rows_ex2 - -- \note when two (or more) duplicated rows exist, only the first occurence -+ \note when two (or more) duplicated rows exist, only the first occurrence - will be preserved, then deleting any further occurrence. - */ - SPATIALITE_DECLARE void remove_duplicated_rows_ex (sqlite3 * sqlite, -@@ -746,7 +746,7 @@ extern "C" - - \sa check_duplicated_rows, remove_duplicated_rows - -- \note when two (or more) duplicated rows exist, only the first occurence -+ \note when two (or more) duplicated rows exist, only the first occurrence - will be preserved, then deleting any further occurrence. - */ - SPATIALITE_DECLARE void remove_duplicated_rows_ex2 (sqlite3 * sqlite, ---- a/src/shapefiles/shapefiles.c -+++ b/src/shapefiles/shapefiles.c -@@ -684,7 +684,7 @@ load_shapefile_ex2 (sqlite3 * sqlite, ch - xdummy = sqlite3_mprintf ("COL_%d", seed++); - spatialite_e - ("Warning: duplicated fieldName \"%s\" in shapefile \"%s\": " -- "renaming the second occurence in table \"%s\" as \"%s\".\n", -+ "renaming the second occurrence in table \"%s\" as \"%s\".\n", - dummy, shp_path, table, xdummy); - dummy = xdummy; - } diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 6ea1ebb..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -occurrence-typo.patch -liblwgeom-2.2.0.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/spatialite.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
