[Git][debian-gis-team/postgis][master] Have the "postgis" package recommend "postgresql-postgis" instead of a specific version.

[Christoph Berg]

Christoph Berg pushed to branch master at Debian GIS Project / postgis


Commits:
decfc889 by Christoph Berg at 2020-11-02T22:55:05+01:00
Have the "postgis" package recommend "postgresql-postgis" instead of a specific version.

When users have already installed a package like postgresql-12-postgis-2.5,
this avoids pulling in postgresql-13-postgis-3 on "apt install postgis".

https://www.postgresql.org/message-id/CAAV-988tVaJi4oRe0WxUkA-6WkiawsgA_XWX93LoiGEtMuRxKA%40mail.gmail.com

In passing, remove the extra NEWEST_PGVERSION logic in debian/control.in
handling.

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/control.in
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+postgis (3.0.2+dfsg-5) UNRELEASED; urgency=medium
+
+  * Have the "postgis" package recommend "postgresql-postgis" instead of a
+    specific version.
+
+ -- Christoph Berg <myon at debian.org>  Mon, 02 Nov 2020 22:49:23 +0100
+
 postgis (3.0.2+dfsg-4) unstable; urgency=medium
 
   [ Christoph Berg ]


=====================================
debian/control
=====================================
@@ -43,7 +43,7 @@ Package: postgis
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Recommends: postgresql-13-postgis-3,
+Recommends: postgresql-postgis,
             postgis-doc
 Description: Geographic objects support for PostgreSQL
  PostGIS adds support for geographic objects to the PostgreSQL
@@ -112,4 +112,3 @@ Description: Geographic objects support for PostgreSQL 13 -- SQL scripts
  .
  This package contains the SQL scripts for installing PostGIS in a PostgreSQL
  13 database, and for upgrading from earlier PostGIS versions.
-


=====================================
debian/control.in
=====================================
@@ -43,7 +43,7 @@ Package: postgis
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Recommends: postgresql-NEWEST_PGVERSION-postgis-3,
+Recommends: postgresql-postgis,
             postgis-doc
 Description: Geographic objects support for PostgreSQL
  PostGIS adds support for geographic objects to the PostgreSQL


=====================================
debian/rules
=====================================
@@ -22,25 +22,7 @@ endif
 
 include /usr/share/dpkg/architecture.mk
 include /usr/share/dpkg/pkg-info.mk
-
-# Magic to automatically create a debian/control file for the (or all)
-# supported versions of Postgres.
-#
-# Blatantly copied from
-# /usr/share/postgresql-common/pgxs_debian_control.mk and extended to
-# support NEWEST_VERSION and fiddle with postgis 2.0 transitional
-# packages.
-debian/control: debian/control.in debian/pgversions
-	(set -e; \
-	VERSIONS=`pg_buildext supported-versions $(CURDIR)` || exit $$?; \
-	NEWEST_VERSION=`pg_buildext supported-versions $(CURDIR) | tail -1` || exit $$?; \
-	grep-dctrl -vP PGVERSION $< \
-		| sed -e "s:NEWEST_PGVERSION:$$NEWEST_VERSION:" > $@.pgxs_tmp; \
-	for v in $$VERSIONS; do \
-		grep-dctrl -P PGVERSION $< \
-			| sed -e "s:PGVERSION:$$v:" >> $@.pgxs_tmp; \
-	done; \
-	mv $@.pgxs_tmp $@) || (rm -f $@.pgxs_tmp; exit 1)
+include /usr/share/postgresql-common/pgxs_debian_control.mk
 
 # Upstream version (including ~rcN) for symbols version
 UPSTREAM_VERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//')



View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/commit/decfc889139b9e074bfe7ec4b29996e48c174a02

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/commit/decfc889139b9e074bfe7ec4b29996e48c174a02
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/20201102/e82caac0/attachment-0001.html>