[Git][debian-gis-team/spatialite-tools][master] 12 commits: Enable parallel builds.

Bas Couwenberg gitlab at salsa.debian.org
Sat Apr 13 14:54:22 BST 2019



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


Commits:
cd5955c9 by Bas Couwenberg at 2019-04-13T13:35:58Z
Enable parallel builds.

- - - - -
d57a649a by Bas Couwenberg at 2019-04-13T13:36:38Z
Enable all hardening buildflags.

- - - - -
43b8482a by Bas Couwenberg at 2019-04-13T13:38:53Z
Reorder build dependencies.

- - - - -
f89fa3d7 by Bas Couwenberg at 2019-04-13T13:39:45Z
Use pkg-info.mk variables instead of dpkg-parsechangelog output.

- - - - -
41d29cde by Bas Couwenberg at 2019-04-13T13:40:20Z
Update copyright-format URL to use HTTPS.

- - - - -
4989879a by Bas Couwenberg at 2019-04-13T13:40:29Z
Update watch file to use HTTPS.

- - - - -
ad7b13a8 by Bas Couwenberg at 2019-04-13T13:41:19Z
Update Vcs-* URLs for Salsa.

- - - - -
b4e7e4f7 by Bas Couwenberg at 2019-04-13T13:41:29Z
Strip trailing whitespace from control & rules files.

- - - - -
2199bd84 by Bas Couwenberg at 2019-04-13T13:47:13Z
Add patch to fix spelling errors.

- - - - -
ce4ff9f0 by Bas Couwenberg at 2019-04-13T13:47:13Z
Fix typo in manpage.

- - - - -
e01fe4e6 by Bas Couwenberg at 2019-04-13T13:47:13Z
Add lintian override for testsuite-autopkgtest-missing.

- - - - -
17dd4fa6 by Bas Couwenberg at 2019-04-13T13:47:13Z
Bump Standards-Version to 4.3.0, no changes.

- - - - -


9 changed files:

- debian/changelog
- debian/control
- debian/copyright
- debian/man/spatialite_osm_net.1.xml
- + debian/patches/series
- + debian/patches/spelling-errors.patch
- debian/rules
- + debian/source/lintian-overrides
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,20 @@
+spatialite-tools (4.3.0-3) UNRELEASED; urgency=medium
+
+  * Enable parallel builds.
+  * Enable all hardening buildflags.
+  * Reorder build dependencies.
+  * Use pkg-info.mk variables instead of dpkg-parsechangelog output.
+  * Update copyright-format URL to use HTTPS.
+  * Update watch file to use HTTPS.
+  * Update Vcs-* URLs for Salsa.
+  * Strip trailing whitespace from control & rules files.
+  * Add patch to fix spelling errors.
+  * Fix typo in manpage.
+  * Add lintian override for testsuite-autopkgtest-missing.
+  * Bump Standards-Version to 4.3.0, no changes.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 17 Dec 2015 02:45:01 +0100
+
 spatialite-tools (4.3.0-2) unstable; urgency=medium
 
   * Update Vcs-Browser URL to use HTTPS.


=====================================
debian/control
=====================================
@@ -6,26 +6,26 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               autotools-dev,
                dh-autoreconf,
-               libspatialite-dev (>= 4.3.0),
-               libsqlite3-dev,
-               libreadline-dev,
-               pkg-config,
+               autotools-dev,
                libexpat1-dev,
                libfreexl-dev,
                libgeos-dev (>= 3.3.0),
                libproj-dev,
+               libreadline-dev,
                libreadosm-dev,
+               libspatialite-dev (>= 4.3.0),
+               libsqlite3-dev,
                libxml2-dev,
+               pkg-config,
                zlib1g-dev,
                docbook2x,
                docbook-xsl,
                docbook-xml,
                xsltproc
-Standards-Version: 3.9.6
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/spatialite-tools.git
-Vcs-Git: git://anonscm.debian.org/pkg-grass/spatialite-tools.git
+Standards-Version: 4.3.0
+Vcs-Browser: https://salsa.debian.org/debian-gis-team/spatialite-tools
+Vcs-Git: https://salsa.debian.org/debian-gis-team/spatialite-tools.git
 Homepage: https://www.gaia-gis.it/fossil/spatialite-tools/
 
 Package: spatialite-bin
@@ -40,4 +40,3 @@ Description: Geospatial extension for SQLite - tools
  shapefiles and csv/text files as virtual tables.
  .
  This package contains tools useful to manage SQLite databases.
-


=====================================
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-tools
 Upstream-Contact: Alessandro Furieri <a.furieri at lqt.it>
 Source: https://www.gaia-gis.it/fossil/spatialite-tools/


=====================================
debian/man/spatialite_osm_net.1.xml
=====================================
@@ -77,7 +77,7 @@
         <term><option>-T</option> <replaceable>table_name</replaceable></term>
         <term><option>--table</option> <replaceable>table_name</replaceable></term>
         <listitem>
-          <para>the db table to be feeded</para>
+          <para>the db table to be fed</para>
         </listitem>
       </varlistentry>
 


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+spelling-errors.patch


=====================================
debian/patches/spelling-errors.patch
=====================================
@@ -0,0 +1,16 @@
+Description: Fix spelling errors.
+ * feeded -> fed
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://www.gaia-gis.it/fossil/spatialite-tools/info/73964af43602a0ca
+
+--- a/spatialite_osm_net.c
++++ b/spatialite_osm_net.c
+@@ -2259,7 +2259,7 @@ do_help ()
+     fprintf (stderr,
+ 	     "-d or --db-path  pathname       the SpatiaLite DB path\n");
+     fprintf (stderr,
+-	     "-T or --table    table_name     the db table to be feeded\n\n");
++	     "-T or --table    table_name     the db table to be fed\n\n");
+     fprintf (stderr, "you can specify the following options as well\n");
+     fprintf (stderr,
+ 	     "-cs or --cache-size    num      DB cache size (how many pages)\n");


=====================================
debian/rules
=====================================
@@ -7,18 +7,23 @@
 # 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)
+# Enable hardening build flags
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
+include /usr/share/dpkg/pkg-info.mk
+
+FULL_VERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//')
 VERSION := $(shell echo $(FULL_VERSION) | sed -e "s/~beta[[:digit:]]\+/-BETA/")
 LC_VERSION := $(shell echo $(VERSION) | tr A-Z a-z)
 
-BUILD_DATE=$(shell dpkg-parsechangelog | sed -ne 's/^Date: //p' | LC_ALL=C date -u "+%d %B %Y" -f -)
+BUILD_DATE=$(shell LC_ALL=C date -u "+%d %B %Y" -d "@$(SOURCE_DATE_EPOCH)")
 
 MANPAGES := $(wildcard debian/man/*.*.xml)
 
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 %:
-	dh $@ --with autoreconf
+	dh $@ --with autoreconf --parallel
 
 versions:
 	@echo "Spatialite full version: $(FULL_VERSION)"
@@ -38,4 +43,3 @@ override_dh_auto_build:
 	done
 
 	dh_auto_build
-


=====================================
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/spatialite-tools-sources/ \
+https://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/ \
 (?:|.*/)spatialite-tools(?:[_\-]v?|)(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)



View it on GitLab: https://salsa.debian.org/debian-gis-team/spatialite-tools/compare/8304952d1d2c3f2c5d9ae491e868c6b5b3387bb6...17dd4fa65ff68f9240213de6fa6399536b995559

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/spatialite-tools/compare/8304952d1d2c3f2c5d9ae491e868c6b5b3387bb6...17dd4fa65ff68f9240213de6fa6399536b995559
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/1ed22227/attachment-0001.html>


More information about the Pkg-grass-devel mailing list