[Git][debian-gis-team/gdal-grass][ubuntu/bionic] Rebuild 2.2.3 for bionic

[Martin Landa]

Martin Landa pushed to branch ubuntu/bionic at Debian GIS Project / gdal-grass


Commits:
fad4eee3 by Bas Couwenberg at 2018-10-28T11:27:31Z
Rebuild 2.2.3 for bionic

- - - - -


4 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+libgdal-grass (2.2.3-3~bionic5) bionic; urgency=medium
+
+  * Override dh_gencontrol to set GRASS ABI dependency with substvars.
+
+ -- Martin Landa <landa.martin at gmail.com>  Sun, 28 Oct 2018 12:25:51 +0100
+
 libgdal-grass (2.2.3-3~bionic4) bionic; urgency=medium
 
   * Rebuild for bionic.


=====================================
debian/control
=====================================
@@ -21,7 +21,7 @@ Homepage: http://www.gdal.org/
 Package: libgdal-grass
 Architecture: any
 Section: libs
-Depends: grass742,
+Depends: ${grass:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
 Recommends: gdal-bin


=====================================
debian/control.in deleted
=====================================
@@ -1,34 +0,0 @@
-Source: libgdal-grass
-Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
-Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
-           Bas Couwenberg <sebastic at debian.org>
-Section: science
-Priority: optional
-Build-Depends: debhelper (>= 9),
-               dh-autoreconf,
-               d-shlibs,
-               grass (>= 7.2.2~rc2),
-               grass-dev (>= 7.2.2~rc2),
-               libgdal-dev (>= 2.2.1),
-               libproj-dev,
-               libpq-dev,
-               pkg-config
-Standards-Version: 4.0.0
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/gdal-grass.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gdal-grass.git -b ubuntu/bionic
-Homepage: http://www.gdal.org/
-
-Package: libgdal-grass
-Architecture: any
-Section: libs
-Depends: @GRASS_ABI@,
-         ${shlibs:Depends},
-         ${misc:Depends}
-Recommends: gdal-bin
-Description: GRASS extension for the GDAL library
- GDAL is a translator library for raster geospatial data formats.
- As a library, it presents a single abstract data model to the
- calling application for all supported formats. This extension
- provides access to GRASS data via GDAL.
- .
- This package provides the GDAL GRASS plugin.


=====================================
debian/rules
=====================================
@@ -14,22 +14,11 @@ ifeq ($(VENDOR_DERIVES_FROM_UBUNTU),yes)
 	export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 endif
 
-PKGNAME=$(shell grep Package: debian/control.in | head -1 | cut -d' ' -f2)
+PKGNAME=$(shell grep Package: debian/control | head -1 | cut -d' ' -f2)
 GRASS=grass$(subst .,,$(shell pkg-config --modversion grass | cut -d. -f1,2))
 GRASS_ABI=grass$(subst .,,$(shell pkg-config --modversion grass | cut -d. -f1,2,3 | sed -e 's/RC/-/'))
 GDAL=$(shell cat VERSION | cut -d. -f1,2)
 
-TEMPLATES=$(wildcard debian/*.in)
-
-templates:
-	for TEMPLATE in $(TEMPLATES) ; do \
-	    sed -e 's/@GDAL@/$(GDAL)/g' \
-	        -e 's/@GRASS@/$(GRASS)/g' \
-	        -e 's/@GRASS_ABI@/$(GRASS_ABI)/g' \
-	        -e 's/@PKGNAME@/$(PKGNAME)/g' \
-	        $$TEMPLATE > `echo $$TEMPLATE | sed 's/.in$$//'` ; \
-	done
-
 %:
 	dh $@ --with autoreconf --parallel
 
@@ -43,7 +32,7 @@ override_dh_autoreconf_clean:
 		mv configure.pre-autoreconf configure ; \
 	fi
 
-override_dh_auto_configure: templates
+override_dh_auto_configure:
 	# Abort if source and gdal have not the same versions.
 	if [ `gdal-config --version` != `cat VERSION` ]; then \
 		echo "GDAL version and GDAL GRASS plugin version are not aligned. Please, upload a proper plugin source version."; \
@@ -72,3 +61,5 @@ override_dh_strip:
 	# Debug files contain no debug symbols
 	dh_strip --no-automatic-dbgsym
 
+override_dh_gencontrol:
+	dh_gencontrol -- -Vgrass:Depends="$(GRASS_ABI)"



View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/commit/fad4eee39510fcbf1bc2966c27359808245c8e00

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/commit/fad4eee39510fcbf1bc2966c27359808245c8e00
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/20181028/2958d46f/attachment-0001.html>