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

[frankie at alioth.debian.org]

Author: frankie
Date: 2009-09-17 13:36:50 +0000 (Thu, 17 Sep 2009)
New Revision: 2457

Modified:
   packages/gdal-grass/trunk/debian/control.in
   packages/gdal-grass/trunk/debian/rules
Log:
Fixed GRASS ABI vs VERSION


Modified: packages/gdal-grass/trunk/debian/control.in
===================================================================
--- packages/gdal-grass/trunk/debian/control.in	2009-09-16 11:18:00 UTC (rev 2456)
+++ packages/gdal-grass/trunk/debian/control.in	2009-09-17 13:36:50 UTC (rev 2457)
@@ -13,7 +13,7 @@
 Package: libgdal1-1.6.0-grass
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, @GRASS@
+Depends: ${shlibs:Depends}, @GRASS_ABI@
 Recommends: gdal-bin
 Description: GRASS extension for the GDAL library
  GDAL is a translator library for raster geospatial data formats.

Modified: packages/gdal-grass/trunk/debian/rules
===================================================================
--- packages/gdal-grass/trunk/debian/rules	2009-09-16 11:18:00 UTC (rev 2456)
+++ packages/gdal-grass/trunk/debian/rules	2009-09-17 13:36:50 UTC (rev 2457)
@@ -9,7 +9,8 @@
 #export DH_VERBOSE=1
 
 PKGNAME=$(shell grep Package: debian/control|cut -d' ' -f2)
-GRASS=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2,3|sed -e 's/RC/-/'))
+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=gdal$(subst .,,$(shell cat VERSION|cut -d. -f1,2))
 
 # Abort if source and gdal have not the same versions.
@@ -20,7 +21,7 @@
 include /usr/share/dpatch/dpatch.make
 
 debian/control: debian/control.in
-	sed -e 's/@GRASS@/$(GRASS)/' $< >$@
+	sed -e 's/@GRASS_ABI@/$(GRASS_ABI)/'  $< >$@
 
 config.status: debian/control
 	dh_testdir