This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch experimental
in repository gdal-grass.
commit 80507c6c403fa231ed47c637d30e37aaa077a117
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Fri May 9 01:10:37 2014 +0200
Move GDAL version check to configure target, to allow pbuilder builds
without requiring a matching GDAL installed outside the build environment.
---
debian/changelog | 2 ++
debian/rules | 11 ++++++-----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b4a2722..c5d6581 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ libgdal-grass (1.11.0-1) UNRELEASED; urgency=low
* New upstream release.
* Update copyright file.
+ * Move GDAL version check to configure target, to allow pbuilder builds
+ without requiring a matching GDAL installed outside the build environment.
-- Bas Couwenberg <sebas...@xs4all.nl> Sun, 04 May 2014 14:43:12 +0200
diff --git a/debian/rules b/debian/rules
index 10fbcec..8f6cd6f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,11 +9,6 @@ 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)
-# Abort if source and gdal have not the same versions.
-ifneq ($(shell gdal-config --version),$(shell cat VERSION))
-$(error GDAL version and GDAL GRASS plugin version are not aligned. Please,
upload a proper plugin source version.)
-endif
-
%:
dh $@ --with autoreconf --parallel
@@ -28,6 +23,12 @@ override_dh_autoreconf_clean:
fi
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."; \
+ 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
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/gdal-grass.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
