[gdal-grass] 01/01: Override dh_gencontrol to set GRASS ABI dependency with substvars.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository gdal-grass.

commit 3ebaba99f8475af18767d9e065611cb0b93ef3aa
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Nov 5 10:23:53 2017 +0100

    Override dh_gencontrol to set GRASS ABI dependency with substvars.
---
 debian/changelog  |  6 ++++++
 debian/control    |  2 +-
 debian/control.in | 35 -----------------------------------
 debian/rules      | 17 ++++-------------
 4 files changed, 11 insertions(+), 49 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8b10346..5fe4ad1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libgdal-grass (2.2.2-2) UNRELEASED; urgency=medium
+
+  * Override dh_gencontrol to set GRASS ABI dependency with substvars.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 05 Nov 2017 10:20:51 +0100
+
 libgdal-grass (2.2.2-1) unstable; urgency=medium
 
   * Bump Standards-Version to 4.1.1, no changes.
diff --git a/debian/control b/debian/control
index bb8e713..d2aab76 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Homepage: http://www.gdal.org/
 Package: libgdal-grass
 Architecture: any
 Section: libs
-Depends: grass722,
+Depends: ${grass:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
 Recommends: gdal-bin
diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index 962d459..0000000
--- a/debian/control.in
+++ /dev/null
@@ -1,35 +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),
-               grass-dev (>= 7.2.2),
-               libgdal-dev (>= 2.2.2),
-               libproj-dev,
-               libpq-dev,
-               pkg-config
-Standards-Version: 4.1.1
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/gdal-grass.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gdal-grass.git
-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.
-
diff --git a/debian/rules b/debian/rules
index cdebb8a..7a02695 100755
--- a/debian/rules
+++ b/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)"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal-grass.git