[DebianGIS-dev] r2412 - packages/gdal-grass/trunk/debian

[frankie at alioth.debian.org]

Author: frankie
Date: 2009-09-08 12:55:58 +0000 (Tue, 08 Sep 2009)
New Revision: 2412

Modified:
   packages/gdal-grass/trunk/debian/control
   packages/gdal-grass/trunk/debian/control.in
   packages/gdal-grass/trunk/debian/rules
Log:
Some fixes for a serious bug.


Modified: packages/gdal-grass/trunk/debian/control
===================================================================
--- packages/gdal-grass/trunk/debian/control	2009-09-02 12:34:00 UTC (rev 2411)
+++ packages/gdal-grass/trunk/debian/control	2009-09-08 12:55:58 UTC (rev 2412)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
-Build-Depends: debhelper (>= 7), d-shlibs, libgdal1-dev (>= 1.6.0), pkg-config, grass-dev (>= 6.4.0~rc3), 
+Build-Depends: debhelper (>= 7), d-shlibs, libgdal1-dev (>= 1.6.2-1), pkg-config, grass-dev (>= 6.4.0~rc3), 
  grass (>= 6.4.0~rc3), dpatch, libproj-dev
 Standards-Version: 3.8.1
 Homepage: http://www.gdal.org/

Modified: packages/gdal-grass/trunk/debian/control.in
===================================================================
--- packages/gdal-grass/trunk/debian/control.in	2009-09-02 12:34:00 UTC (rev 2411)
+++ packages/gdal-grass/trunk/debian/control.in	2009-09-08 12:55:58 UTC (rev 2412)
@@ -3,9 +3,9 @@
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
-Build-Depends: debhelper (>= 7), d-shlibs, libgdal1-dev (>= 1.6.0), pkg-config, grass-dev (>= 6.4.0~rc3), 
+Build-Depends: debhelper (>= 7), d-shlibs, libgdal1-dev (>= 1.6.2-1), pkg-config, grass-dev (>= 6.4.0~rc3), 
  grass (>= 6.4.0~rc3), dpatch, libproj-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Homepage: http://www.gdal.org/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/gdal-grass/trunk
 Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/gdal-grass/trunk

Modified: packages/gdal-grass/trunk/debian/rules
===================================================================
--- packages/gdal-grass/trunk/debian/rules	2009-09-02 12:34:00 UTC (rev 2411)
+++ packages/gdal-grass/trunk/debian/rules	2009-09-08 12:55:58 UTC (rev 2412)
@@ -1,7 +1,8 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 #
-# debian package by Alessandro Amici 2002-2003.
+# Debian package by Alessandro Amici 2002-2003. 
+# Maintained by DebianGis team since 2005.
 # Based on: GNU copyright 1997 to 1999 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
@@ -9,8 +10,13 @@
 
 PKGNAME=$(shell grep Package: debian/control|cut -d' ' -f2)
 GRASS=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2))
-GDAL=gdal$(subst .,,$(shell gdal-config --version|cut -d. -f1,2))
+GDAL=gdal$(subst .,,$(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
+
 include /usr/share/dpatch/dpatch.make
 
 debian/control: debian/control.in