[Git][debian-gis-team/postgis][master] 5 commits: Merge -arch & -indep targets. (closes: #932833)
Bas Couwenberg
gitlab at salsa.debian.org
Tue Jul 23 21:27:49 BST 2019
Bas Couwenberg pushed to branch master at Debian GIS Project / postgis
Commits:
49b7ceb9 by Bas Couwenberg at 2019-07-23T19:29:01Z
Merge -arch & -indep targets. (closes: #932833)
- - - - -
9ab5cee0 by Bas Couwenberg at 2019-07-23T19:30:21Z
Update PIE hardening conditional, trusty is EOL.
- - - - -
362dacbd by Bas Couwenberg at 2019-07-23T19:50:54Z
Explicitly remove liblwgeom.la before dh_install.
- - - - -
2d41569b by Bas Couwenberg at 2019-07-23T20:14:57Z
Bump Standards-Version to 4.4.0, no changes.
- - - - -
94b62867 by Bas Couwenberg at 2019-07-23T20:14:57Z
Set distribution to unstable.
- - - - -
4 changed files:
- debian/changelog
- debian/control
- debian/control.in
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+postgis (2.5.2+dfsg-2) unstable; urgency=medium
+
+ * Merge -arch & -indep targets.
+ (closes: #932833)
+ * Update PIE hardening conditional, trusty is EOL.
+ * Explicitly remove liblwgeom.la before dh_install.
+ * Bump Standards-Version to 4.4.0, no changes.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 23 Jul 2019 21:51:23 +0200
+
postgis (2.5.2+dfsg-1) unstable; urgency=medium
* Update gbp.conf to use --source-only-changes by default.
=====================================
debian/control
=====================================
@@ -35,7 +35,7 @@ Build-Depends: autoconf2.13,
protobuf-c-compiler,
rdfind,
xsltproc
-Standards-Version: 4.3.0
+Standards-Version: 4.4.0
Vcs-Browser: https://salsa.debian.org/debian-gis-team/postgis
Vcs-Git: https://salsa.debian.org/debian-gis-team/postgis.git
Homepage: http://postgis.net/
=====================================
debian/control.in
=====================================
@@ -35,7 +35,7 @@ Build-Depends: autoconf2.13,
protobuf-c-compiler,
rdfind,
xsltproc
-Standards-Version: 4.3.0
+Standards-Version: 4.4.0
Vcs-Browser: https://salsa.debian.org/debian-gis-team/postgis
Vcs-Git: https://salsa.debian.org/debian-gis-team/postgis.git
Homepage: http://postgis.net/
=====================================
debian/rules
=====================================
@@ -15,7 +15,7 @@ VENDOR_DERIVES_FROM_UBUNTU ?= $(shell dpkg-vendor --derives-from Ubuntu && echo
DISTRIBUTION_RELEASE := $(shell lsb_release -cs)
ifeq ($(VENDOR_DERIVES_FROM_UBUNTU),yes)
- ifneq (,$(filter $(DISTRIBUTION_RELEASE),trusty xenial bionic))
+ ifneq (,$(filter $(DISTRIBUTION_RELEASE),xenial bionic))
export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
endif
endif
@@ -99,9 +99,6 @@ endif
override_dh_autoreconf:
dh_autoreconf ./autogen.sh
-override_dh_clean:
- dh_clean build-arch-stamp
-
override_dh_auto_clean: debian/control
# Clean all separate build directories.
(set -e; \
@@ -154,13 +151,7 @@ override_dh_auto_configure:
--with-pgconfig=/usr/lib/postgresql/$$PGVER/bin/pg_config; \
done)
- # remove file erroneously still generated by configure in 2.5.0beta1
- # https://github.com/postgis/postgis/pull/270
- rm -vf extensions/postgis_tiger_geocoder/postgis_tiger_geocoder.control
- rm -vf debian/build-*/extensions/postgis_tiger_geocoder/postgis_tiger_geocoder.control
-
-override_dh_auto_build-arch: build-arch-stamp
-build-arch-stamp:
+override_dh_auto_build:
# Build against the newest Postgres version
@echo " ### building $(NEWEST_POSTGRES_VERSION) ###"
$(MAKE) $(NJOBS)
@@ -173,9 +164,6 @@ build-arch-stamp:
$(MAKE) $(NJOBS) -C $(CURDIR)/debian/build-$$PGVER; \
done)
- touch $@
-
-override_dh_auto_build-indep: build-arch-stamp
# Let PostGIS create a perl script from postgis_restore.pl.in
$(MAKE) $(NJOBS) -C utils
@@ -189,9 +177,9 @@ override_dh_auto_build-indep: build-arch-stamp
# clever enough to run this before 'install'.
$(MAKE) $(NJOBS) -C extensions
-override_dh_auto_test-indep:
+ touch $@
-override_dh_auto_test-arch:
+override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
# Run unit tests (against the newest Postgres version, first)
echo "LD_PRELOAD = '$(CURDIR)/liblwgeom/.libs/liblwgeom-$(MAJOR_VERSION).$(MINOR_VERSION).so.$(LIBLWGEOM_SOVERSION)'" \
@@ -213,7 +201,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
done
endif
-override_dh_auto_install-indep:
+override_dh_auto_install:
# Install the most recent Postgres version. Note that we used to
# install only utils and extensions. However, there are sql scripts
# in postgis, raster and topology as well, which need to be
@@ -228,41 +216,7 @@ override_dh_auto_install-indep:
done)
# Compile and install docs
- $(MAKE) -C doc docs-install \
- DESTDIR=$(CURDIR)/debian/tmp \
- PGSQL_DOCDIR=/usr/share/doc
-
-override_dh_install-indep:
- dh_install -i
-
-# Set executable bit for postgis_restore.pl
- chmod 755 $(CURDIR)/debian/*/usr/share/postgresql/*/contrib/postgis-*/postgis_restore.pl
-
-# De-duplicate upgrade scripts - using hard-links for exactly one
-# directory (so we don't generate cross-directory hard ones).
- (set -e; \
- for PGVER in $(OTHER_POSTGRES_VERSIONS) $(NEWEST_POSTGRES_VERSION); do \
- rdfind -makeresultsfile false -makehardlinks true \
- $(CURDIR)/debian/postgresql-$$PGVER-postgis-*-scripts/usr/share/postgresql/$$PGVER/extension; \
- done)
-
-# Don't include desktop file & application icons in scripts package
- rm -rf debian/postgresql-*-postgis-*-scripts/usr/share/postgresql/*/applications
- rm -rf debian/postgresql-*-postgis-*-scripts/usr/share/postgresql/*/icons
-
-override_dh_auto_install-arch:
-# Install the extension for the most recent Postgres verison
- $(MAKE) $(NJOBS) install DESTDIR=$(CURDIR)/debian/tmp
-
-# Install the extensions for the older Postgres versions
- (set -e; \
- for PGVER in $(OTHER_POSTGRES_VERSIONS); do \
- $(MAKE) $(NJOBS) -C $(CURDIR)/debian/build-$$PGVER \
- install DESTDIR=$(CURDIR)/debian/tmp; \
- done)
-
-# Install docs and man pages
- $(MAKE) -C doc man-install \
+ $(MAKE) -C doc docs-install man-install \
DESTDIR=$(CURDIR)/debian/tmp \
PGSQL_DOCDIR=/usr/share/doc \
PGSQL_MANDIR=/usr/share/man
@@ -295,8 +249,28 @@ override_dh_auto_install-arch:
mv $(CURDIR)/debian/tmp/usr/share/postgresql/$(NEWEST_POSTGRES_VERSION)/icons \
$(CURDIR)/debian/postgis-gui/usr/share/
-override_dh_install-arch:
- dh_install -a
+# Set executable bit for postgis_restore.pl
+ chmod 755 $(CURDIR)/debian/*/usr/share/postgresql/*/contrib/postgis-*/postgis_restore.pl
+
+# De-duplicate upgrade scripts - using hard-links for exactly one
+# directory (so we don't generate cross-directory hard ones).
+ (set -e; \
+ for PGVER in $(OTHER_POSTGRES_VERSIONS) $(NEWEST_POSTGRES_VERSION); do \
+ rdfind -makeresultsfile false -makehardlinks true \
+ $(CURDIR)/debian/postgresql-$$PGVER-postgis-*-scripts/usr/share/postgresql/$$PGVER/extension; \
+ done)
+
+# Don't include desktop file & application icons in scripts package
+ rm -rf debian/postgresql-*-postgis-*-scripts/usr/share/postgresql/*/applications
+ rm -rf debian/postgresql-*-postgis-*-scripts/usr/share/postgresql/*/icons
+
+override_dh_install:
+ $(RM) $(CURDIR)/debian/tmp/usr/lib/liblwgeom.la
+ $(RM) $(CURDIR)/debian/tmp/usr/lib/postgresql/*/bin/*
+ $(RM) $(CURDIR)/debian/tmp/usr/share/doc/postgis/README.postgis
+ $(RM) $(CURDIR)/debian/tmp/usr/share/doc/postgresql-doc-*/extension/README.address_standardizer
+
+ dh_install --list-missing
override_dh_makeshlibs:
dh_makeshlibs -Xusr/lib/postgis -- -v$(UPSTREAM_VERSION)
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/compare/1d85dfdad5695e7280718876fd2f59e94f4af3e1...94b62867488f09dd8eb1970c18d5f9fe49b380fd
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/compare/1d85dfdad5695e7280718876fd2f59e94f4af3e1...94b62867488f09dd8eb1970c18d5f9fe49b380fd
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/20190723/c5354f7e/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list