[Git][debian-gis-team/postgis][experimental] 2 commits: Merge -arch & -indep targets. (closes: #932833)

Bas Couwenberg gitlab at salsa.debian.org
Tue Jul 23 21:05:24 BST 2019 


Bas Couwenberg pushed to branch experimental at Debian GIS Project / postgis


Commits:
8ce2be41 by Bas Couwenberg at 2019-07-23T19:05:24Z
Merge -arch & -indep targets. (closes: #932833)

- - - - -
9beeb2e6 by Bas Couwenberg at 2019-07-23T19:51:57Z
Set distribution to experimental.

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-postgis (3.0.0~alpha3+dfsg-1~exp2) UNRELEASED; urgency=medium
+postgis (3.0.0~alpha3+dfsg-1~exp2) experimental; urgency=medium
 
   [ Christoph Berg ]
   * debian/tests/control: Tests don't need root, but support running as root.
@@ -10,8 +10,10 @@ postgis (3.0.0~alpha3+dfsg-1~exp2) UNRELEASED; urgency=medium
   * Update gbp.conf to use --source-only-changes by default.
   * Bump Standards-Version to 4.4.0, no changes.
   * Update PIE hardening conditional, trusty is EOL.
+  * Merge -arch & -indep targets.
+    (closes: #932833)
 
- -- Christoph Berg <myon at debian.org>  Tue, 02 Jul 2019 14:38:52 +0200
+ -- Bas Couwenberg <sebastic at debian.org>  Tue, 23 Jul 2019 21:51:42 +0200
 
 postgis (3.0.0~alpha3+dfsg-1~exp1) experimental; urgency=medium
 


=====================================
debian/rules
=====================================
@@ -91,9 +91,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; \
@@ -143,8 +140,7 @@ override_dh_auto_configure:
 			--with-pgconfig=/usr/lib/postgresql/$$PGVER/bin/pg_config; \
 	done)
 
-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)
@@ -157,9 +153,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
 
@@ -173,9 +166,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 " ### testing $(NEWEST_POSTGRES_VERSION) ###"
@@ -191,7 +184,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
@@ -206,41 +199,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
@@ -273,12 +232,27 @@ 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:
+#	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/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 -a --list-missing
+	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/8da881a0deba47020765c7757923931899725e6f...9beeb2e616d9c3bdcc3b3811720291c2ec3686c8

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/compare/8da881a0deba47020765c7757923931899725e6f...9beeb2e616d9c3bdcc3b3811720291c2ec3686c8
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/69c7224d/attachment-0001.html>

More information about the Pkg-grass-devel mailing list