[gdal-grass] 01/02: Move control file generation to separate templates target.

[Bas Couwenberg]

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

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

commit 4c36469628a7da18a1508cc245387d13fd3c6ef7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Jul 4 21:56:21 2016 +0200

    Move control file generation to separate templates target.
---
 debian/changelog            |  1 +
 debian/lintian-overrides    |  4 ++++
 debian/lintian-overrides.in |  1 +
 debian/rules                | 22 ++++++++++++----------
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5409d13..8821a9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libgdal-grass (2.1.1~rc1-1) UNRELEASED; urgency=medium
 
   * New upstream release candidate.
+  * Move control file generation to separate templates target.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 04 Jul 2016 02:24:53 +0200
 
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
new file mode 100644
index 0000000..e0bfc2d
--- /dev/null
+++ b/debian/lintian-overrides
@@ -0,0 +1,4 @@
+# The run path has been added to get GRASS internal library
+libgdal20-2.1.1-grass: binary-or-shlib-defines-rpath usr/lib/gdalplugins/*/gdal_GRASS.so /usr/lib/grass*/lib
+libgdal20-2.1.1-grass: binary-or-shlib-defines-rpath usr/lib/gdalplugins/*/ogr_GRASS.so /usr/lib/grass*/lib
+
diff --git a/debian/lintian-overrides.in b/debian/lintian-overrides.in
index 0ca1fd1..ded1553 100644
--- a/debian/lintian-overrides.in
+++ b/debian/lintian-overrides.in
@@ -1,3 +1,4 @@
 # The run path has been added to get GRASS internal library
 @PKGNAME@: binary-or-shlib-defines-rpath usr/lib/gdalplugins/*/gdal_GRASS.so /usr/lib/grass*/lib
 @PKGNAME@: binary-or-shlib-defines-rpath usr/lib/gdalplugins/*/ogr_GRASS.so /usr/lib/grass*/lib
+
diff --git a/debian/rules b/debian/rules
index ed5e4be..86577b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,17 @@ 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
 
@@ -25,22 +36,13 @@ override_dh_autoreconf_clean:
 		mv configure.pre-autoreconf configure ; \
 	fi
 
-override_dh_auto_configure:
+override_dh_auto_configure: templates
 	# 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."; \
 		exit 1; \
 	fi
 
-	sed -e 's/@GRASS_ABI@/$(GRASS_ABI)/' debian/control.in > debian/control
-
-	sed -e 's/@GDAL@/$(GDAL)/' -e 's/@GRASS@/$(GRASS)/' -e 's/@PKGNAME@/$(PKGNAME)/' debian/lintian-overrides.in > debian/$(PKGNAME).lintian-overrides
-
-	@echo "Depending on $(GRASS)"
-	if [ `grep "$(GRASS_ABI)" debian/control|wc -l` -eq 0 ]; then \
-		sed -e 's/@GRASS_ABI@/$(GRASS_ABI)/' debian/control.in > debian/control; \
-	fi
-
 	dh_auto_configure -- \
 	                  --prefix=/usr \
 	                  --with-autoload=/usr/lib/gdalplugins/$(GDAL) \

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