[Git][debian-gis-team/spatialite][master] 18 commits: Enable all hardening buildflags.

Bas Couwenberg gitlab at salsa.debian.org
Sat Apr 13 10:44:00 BST 2019 


Bas Couwenberg pushed to branch master at Debian GIS Project / spatialite


Commits:
d96150c3 by Bas Couwenberg at 2019-04-13T09:08:00Z
Enable all hardening buildflags.

- - - - -
6638568d by Bas Couwenberg at 2019-04-13T09:10:47Z
Reorder build dependencies.

- - - - -
e41dce6d by Bas Couwenberg at 2019-04-13T09:11:31Z
Reorder configure options.

- - - - -
5cf586ba by Bas Couwenberg at 2019-04-13T09:13:24Z
Use pkg-info.mk variables instead of dpkg-parsechangelog output.

- - - - -
0c276a5e by Bas Couwenberg at 2019-04-13T09:15:14Z
Change priority from extra to optional.

- - - - -
04546348 by Bas Couwenberg at 2019-04-13T09:16:14Z
Strip trailing whitespace from changelog, control & rules files.

- - - - -
841bd32f by Bas Couwenberg at 2019-04-13T09:16:55Z
Update copyright-format URL to use HTTPS.

- - - - -
7034a1c7 by Bas Couwenberg at 2019-04-13T09:17:05Z
Update watch file to use HTTPS.

- - - - -
40836b07 by Bas Couwenberg at 2019-04-13T09:18:11Z
Update Vcs-* URLs for Salsa.

- - - - -
0b8265f5 by Bas Couwenberg at 2019-04-13T09:18:53Z
Drop obsolete dbg package.

- - - - -
5461e3ef by Bas Couwenberg at 2019-04-13T09:19:36Z
Add Build-Depends-Package field to symbols file.

- - - - -
49fdf511 by Bas Couwenberg at 2019-04-13T09:21:12Z
Bump Standards-Version to 4.3.0, no changes.

- - - - -
692923a0 by Bas Couwenberg at 2019-04-13T09:22:31Z
Add -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H to CFLAGS for PROJ 6.0.0.

- - - - -
979b7ae2 by Bas Couwenberg at 2019-04-13T09:23:39Z
Remove package name from lintian overrides.

- - - - -
9201ad9f by Bas Couwenberg at 2019-04-13T09:24:50Z
Update URL to SQLite Loadable Extensions documentation.

- - - - -
8a396e28 by Bas Couwenberg at 2019-04-13T09:26:52Z
Enable parallel builds, disable parallel test execution.

- - - - -
d42c1572 by Bas Couwenberg at 2019-04-13T09:27:49Z
Add lintian override for testsuite-autopkgtest-missing.

- - - - -
bf9033e4 by Bas Couwenberg at 2019-04-13T09:43:41Z
Add patch to fix spelling errors.

- - - - -


11 changed files:

- debian/README.Debian
- debian/changelog
- debian/control
- debian/copyright
- debian/libspatialite7.symbols
- debian/libsqlite3-mod-spatialite.lintian-overrides
- debian/patches/series
- + debian/patches/spelling-errors.patch
- debian/rules
- + debian/source/lintian-overrides
- debian/watch


Changes:

=====================================
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
=====================================
@@ -1,3 +1,26 @@
+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 at 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.
@@ -128,7 +151,7 @@ spatialite (4.2.1~rc1-1~exp1) experimental; urgency=medium
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 28 Nov 2014 18:57:53 +0100
 
 spatialite (4.2.0-1~exp1) experimental; urgency=low
- 
+
   * New upstream release candidate.
   * Refresh patches.
   * Update copyright file.
@@ -261,7 +284,7 @@ spatialite (3.1.0~rc2-1) unstable; urgency=low
 spatialite (3.0.2~20120302-1) unstable; urgency=low
 
   * New upstream pre-release.
-  * Added 07-fix_spatialite_pc.patch: now avoid re-linking also in spatialite.pc 
+  * Added 07-fix_spatialite_pc.patch: now avoid re-linking also in spatialite.pc
     file.
   * Patchset refreshed.
   * New SONAME set to be compatible with that issued until now.
@@ -273,7 +296,7 @@ spatialite (3.0.1-1) unstable; urgency=low
 
   * New upstream release.
     (closes: #661018)
-  * Patchset refreshed. Finally, Sandro is now following a sane policy with 
+  * Patchset refreshed. Finally, Sandro is now following a sane policy with
     SONAME versioning. Better than never.
   * This version is compatible with Freexl >= 1.0.0 only.
   * Now spatialite source includes the library only, spatialite-tools moved
@@ -321,7 +344,7 @@ spatialite (3.0.0~beta20110817-1) unstable; urgency=low
   * Fixed get-orig-tarball to use full version for pre-release tarballs.
   * Policy bumped to 3.9.2, without changes.
   * The mega-patch systemlibs.diff has been updated.
-  * Removed .pc file manipulation. 
+  * Removed .pc file manipulation.
 
   [ David Paleino ]
   * New upstream pre-release
@@ -395,8 +418,8 @@ spatialite (2.4.0~rc2-1) unstable; urgency=low
 spatialite (2.3.0-1) unstable; urgency=low
 
   * New upstream release with partial repackaing to cope with upstream changes.
-  * New upstream packaging: now this package includes all spatialite-related 
-    tarballs to provide the whole set of binary packages, based on the 
+  * New upstream packaging: now this package includes all spatialite-related
+    tarballs to provide the whole set of binary packages, based on the
     amalgameted sources.
   * Added quilt support. Now the upstream tarball is included as a
     compressed archive to facilitate interactive cleanaups and patching.


=====================================
debian/control
=====================================
@@ -5,21 +5,21 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
            Bas Couwenberg <sebastic at 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
=====================================
@@ -1,4 +1,4 @@
-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 at lqt.it>
 Source: https://www.gaia-gis.it/fossil/libspatialite/


=====================================
debian/libspatialite7.symbols
=====================================
@@ -1,4 +1,5 @@
-libspatialite.so.7 libspatialite7 #MINVER#
+libspatialite.so.7 #PACKAGE# #MINVER#
+* Build-Depends-Package: libspatialite-dev
  Ewkt_create_buffer at Base 3.0.0
  Ewkt_delete_buffer at Base 3.0.0
  Ewkt_flush_buffer at Base 3.0.0


=====================================
debian/libsqlite3-mod-spatialite.lintian-overrides
=====================================
@@ -1,5 +1,5 @@
 # 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
=====================================
@@ -1,2 +1,3 @@
 occurrence-typo.patch
 liblwgeom-2.2.0.patch
+spelling-errors.patch


=====================================
debian/patches/spelling-errors.patch
=====================================
@@ -0,0 +1,15 @@
+Description: Fix spelling errors.
+ * updgrade -> upgrade
+Author: Bas Couwenberg <sebastic at 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
=====================================
@@ -0,0 +1,3 @@
+# 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)



View it on GitLab: https://salsa.debian.org/debian-gis-team/spatialite/compare/e2df532dd48753a03b54e6a2fc2577258806b750...bf9033e42244c7b1f182dfb2aa99e63d7a12601a

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/spatialite/compare/e2df532dd48753a03b54e6a2fc2577258806b750...bf9033e42244c7b1f182dfb2aa99e63d7a12601a
You're receiving this email because of your account on salsa.debian.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20190413/88b5d324/attachment-0001.html>

More information about the Pkg-grass-devel mailing list