debian/README.Debian

@@ -2,7 +2,7 @@ Spatialite for Debian
 ---------------------
 
 Spatialite uses the SQLite experimental extension mechanism described in
-http://www.sqlite.org/cvstrac/wiki?p=LoadableExtensions 
+https://www.sqlite.org/loadext.html
 to provide spatial extensions to the SQLite database in both WKT and WKB
 formats as described by OGC. Note that the SQLite extension support could
 be changed in future release, so be warned.

debian/changelog

+spatialite (4.3.0a-6) UNRELEASED; urgency=medium
+
+  * Enable all hardening buildflags.
+  * Reorder build dependencies.
+  * Reorder configure options.
+  * Use pkg-info.mk variables instead of dpkg-parsechangelog output.
+  * Change priority from extra to optional.
+  * Strip trailing whitespace from changelog, control & rules files.
+  * Update copyright-format URL to use HTTPS.
+  * Update watch file to use HTTPS.
+  * Update Vcs-* URLs for Salsa.
+  * Drop obsolete dbg package.
+  * Add Build-Depends-Package field to symbols file.
+  * Bump Standards-Version to 4.3.0, changes: priority.
+  * Add -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H to CFLAGS for PROJ 6.0.0.
+  * Remove package name from lintian overrides.
+  * Update URL to SQLite Loadable Extensions documentation.
+  * Enable parallel builds, disable parallel test execution.
+  * Add lintian override for testsuite-autopkgtest-missing.
+  * Add patch to fix spelling errors.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sat, 13 Apr 2019 11:07:50 +0200
+
 spatialite (4.3.0a-5) unstable; urgency=medium
 
   * Update Vcs-Git URL to use HTTPS.

debian/control

@@ -5,21 +5,21 @@ Uploaders: Francesco Paolo Lovergine <frankie@debian.org>,
            Bas Couwenberg <sebastic@debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 9),
-               autotools-dev,
+Build-Depends: debhelper (>= 9.20160114),
                dh-autoreconf,
-               libsqlite3-dev,
+               autotools-dev,
+               libexpat1-dev,
+               libfreexl-dev,
                libgeos-dev (>= 3.3.0),
                libproj-dev,
                libreadline-dev,
-               libexpat1-dev,
-               libfreexl-dev,
+               libsqlite3-dev,
                libxml2-dev,
                pkg-config,
                zlib1g-dev
-Standards-Version: 3.9.6
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/spatialite.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/spatialite.git
+Standards-Version: 4.3.0
+Vcs-Browser: https://salsa.debian.org/debian-gis-team/spatialite
+Vcs-Git: https://salsa.debian.org/debian-gis-team/spatialite.git
 Homepage: https://www.gaia-gis.it/fossil/libspatialite
 
 Package: libspatialite7
@@ -57,24 +57,6 @@ Description: Geospatial extension for SQLite - development files
  .
  This package contains development files (static libraries and header files).
 
-Package: libspatialite-dbg
-Architecture: any
-Multi-Arch: same
-Section: debug
-Priority: extra
-Depends: libspatialite7 (= ${binary:Version}),
-         ${misc:Depends}
-Breaks: libspatialite6-dbg (<< 4.3.0~rc0-1~)
-Replaces: libspatialite6-dbg (<< 4.3.0~rc0-1~)
-Description: Geospatial extension for SQLite - debugging symbols
- The SpatiaLite extension enables SQLite to support spatial (geometry) data
- in a way conformant to OpenGis specifications, with both WKT and WKB formats.
- .
- Spatialite also includes Virtualshape and Virtualtext to enable accessing
- shapefiles and csv/text files as virtual tables.
- .
- This package contains debugging symbols for the libraries.
-
 Package: libsqlite3-mod-spatialite
 Architecture: any
 Multi-Arch: same
@@ -90,4 +72,3 @@ Description: Geospatial extension for SQLite - loadable module
  shapefiles and csv/text files as virtual tables.
  .
  This package contains the loadable extension module for SQLite 3.
-

debian/copyright

-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: SpatiaLite
 Upstream-Contact: Alessandro Furieri <a.furieri@lqt.it>
 Source: https://www.gaia-gis.it/fossil/libspatialite/

debian/libspatialite7.symbols

-libspatialite.so.7 libspatialite7 #MINVER#
+libspatialite.so.7 #PACKAGE# #MINVER#
+* Build-Depends-Package: libspatialite-dev
  Ewkt_create_buffer@Base 3.0.0
  Ewkt_delete_buffer@Base 3.0.0
  Ewkt_flush_buffer@Base 3.0.0

debian/libsqlite3-mod-spatialite.lintian-overrides

 # mod_spatialite is a SQLite 3 loadable extension module, not a normal shared library
-libsqlite3-mod-spatialite: non-dev-pkg-with-shlib-symlink usr/lib/*/mod_spatialite.so*
-libsqlite3-mod-spatialite: no-symbols-control-file usr/lib/*/mod_spatialite.so.*
-libsqlite3-mod-spatialite: package-name-doesnt-match-sonames mod-spatialite*
+non-dev-pkg-with-shlib-symlink usr/lib/*/mod_spatialite.so*
+no-symbols-control-file usr/lib/*/mod_spatialite.so.*
+package-name-doesnt-match-sonames mod-spatialite*
 

debian/patches/series

 occurrence-typo.patch
 liblwgeom-2.2.0.patch
+spelling-errors.patch

debian/patches/spelling-errors.patch

+Description: Fix spelling errors.
+ * updgrade -> upgrade
+Author: Bas Couwenberg <sebastic@debian.org>
+
+--- a/src/spatialite/table_cloner.c
++++ b/src/spatialite/table_cloner.c
+@@ -2294,7 +2294,7 @@ gaiaAuxClonerExecute (const void *handle
+ 	  if (!upgrade_output_table (cloner))
+ 	    {
+ 		spatialite_e
+-		    ("CloneTable: unable to updgrade the output table \"%s\"\n",
++		    ("CloneTable: unable to upgrade the output table \"%s\"\n",
+ 		     cloner->out_table);
+ 		return 0;
+ 	    }

debian/rules

@@ -7,10 +7,15 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-FULL_VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -d' ' -f2 | cut -d- -f1)
-VERSION := $(shell echo $(FULL_VERSION) | sed -e "s/~beta[[:digit:]]\+/-BETA/")
-LC_VERSION := $(shell echo $(VERSION) | tr A-Z a-z)
-SPATIALITE_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
+# Enable hardening build flags
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
+# Workaround for proj_api.h deprecation in PROJ 6.0.0
+export DEB_CFLAGS_MAINT_APPEND=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+
+include /usr/share/dpkg/pkg-info.mk
+
+UPSTREAM_VERSION = $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//')
 
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
@@ -25,43 +30,37 @@ endif
 export VERBOSE=1
 
 %:
-	dh $@ --with autoreconf
-
-versions:
-	@echo "Spatialite full version: $(FULL_VERSION)"
-	@echo "Spatialite version: $(LC_VERSION)"
-	@echo "Spatialite symbols: $(SPATIALITE_VERSION)"
+	dh $@ --with autoreconf --parallel
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		--enable-geos \
 		$(EPSG) \
-		--enable-proj \
-		--enable-lwgeom=no \
+		--disable-examples \
 		--enable-gcp=yes \
-		--disable-examples
+		--enable-geos \
+		--enable-lwgeom=no \
+		--enable-proj
 
 override_dh_auto_test:
 	mkdir -p debian/backup/stmt
 	cp test/*.sqlite debian/backup/
 	cp test/sql_stmt_tests/*.sqlite debian/backup/stmt/
 
-	dh_auto_test || echo "Ignoring test failures"
+	dh_auto_test --max-parallel=1 || echo "Ignoring test failures"
 
 	cp debian/backup/stmt/*.sqlite test/sql_stmt_tests/
 	cp debian/backup/*.sqlite test/
 	rm -rf debian/backup
 
 override_dh_makeshlibs:
-	dh_makeshlibs -- -v$(SPATIALITE_VERSION)
+	dh_makeshlibs -- -v$(UPSTREAM_VERSION)
 
 override_dh_shlibdeps:
 	dh_shlibdeps -l/usr/lib:$(CURDIR)/debian/tmp/usr/lib
 
 override_dh_strip:
-	dh_strip --dbg-package=libspatialite-dbg
+	dh_strip --dbgsym-migration='libspatialite-dbg (<< 4.3.0a-6~)'
 
 override_dh_install:
 	$(RM) debian/*/usr/lib/*/*.la
 	dh_install --list-missing
-

debian/source/lintian-overrides

+# Not worth the effort
+testsuite-autopkgtest-missing
+

debian/watch

@@ -2,5 +2,5 @@ version=3
 opts=\
 dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
 uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*[a-z]*)$/$1~$2/;s/RC/rc/ \
-http://www.gaia-gis.it/gaia-sins/libspatialite-sources/ \
+https://www.gaia-gis.it/gaia-sins/libspatialite-sources/ \
 (?:|.*/)libspatialite(?:[_\-]v?|)(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)