[SCM] grass branch, master, updated. upstream/6.4.1-106-gd9fdb4d

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 8f62218e4306ada734b9b33930c8368a63388362
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Mon May 28 15:40:34 2012 +0200

    Minor change for b-d.

diff --git a/debian/changelog b/debian/changelog
index d078b1a..c5b1d64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ grass (6.4.2-1) unstable; urgency=low
 
   [ Francesco Paolo Lovergine ]
   * Moved to use TIFF 4.0.1 instead of the legacy flavor.
+  * Moved to use libgdal-dev (introduced in 1.9+) b-d.
 
  -- M. Hamish Bowman <hamish_b at yahoo.com>  Mon, 28 May 2012 21:47:12 +1200
 
diff --git a/debian/control b/debian/control
index 2a00888..3335e78 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-depends:
   libcairo2-dev,
   libfftw3-dev,
   libfreetype6-dev,
-  libgdal1-dev (>= 1.5.0),
+  libgdal-dev| libgdal1-dev (>= 1.5.0),
   libglu1-mesa-dev | libglu1-xorg-dev, 
   libjpeg-dev, libpng12-dev, libtiff5-dev | libtiff4-dev,
   libmysqlclient-dev | libmysqlclient15-dev,
diff --git a/debian/control.in b/debian/control.in
index 9c7d880..e5d5841 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -14,7 +14,7 @@ Build-depends:
   libcairo2-dev,
   libfftw3-dev,
   libfreetype6-dev,
-  libgdal1-dev (>= 1.5.0),
+  libgdal-dev| libgdal1-dev (>= 1.5.0),
   libglu1-mesa-dev | libglu1-xorg-dev, 
   libjpeg-dev, libpng12-dev, libtiff5-dev | libtiff4-dev,
   libmysqlclient-dev | libmysqlclient15-dev,

-- 
Geographic Resources Analysis Support System