[SCM] grass branch, master, updated. upstream/6.4.1-125-ge7a553f

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit e7a553fb17dc82705f04aaa7a5f816571fa26003
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Sep 18 14:04:36 2013 +0200

    Fixed for new tiff migration.

diff --git a/debian/changelog b/debian/changelog
index 1d49914..5816cb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 grass (6.4.3-1) unstable; urgency=low
 
+  [ M. Hamish Bowman ]
   * Packaged new upstream version.
   * Build-Depends on libpng-dev for LibPNG transition.
     (closes: #662361)
@@ -10,7 +11,11 @@ grass (6.4.3-1) unstable; urgency=low
   * Partial enable of the hardening flags.
   * Prepare for libtiff-dev transition. (debian-release/2013/05/msg00127.html)
 
- -- M. Hamish Bowman <hamish_b at yahoo.com>  Wed, 11 Sep 2013 14:17:50 +1200
+  [ Francesco Paolo Lovergine ]
+  * Modified libtiff dependencies to work as in current plan for libtiff
+    migration.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 18 Sep 2013 13:50:49 +0200
 
 grass (6.4.2-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 159729a..cfffed7 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-depends:
   libglu1-mesa-dev | libglu1-xorg-dev, 
   libjpeg-dev,
   libpng-dev | libpng12-dev,
-  libtiff5-dev | libtiff-dev | libtiff4-dev,
+  libtiff-dev (>> 4.0.3-1~) | libtiff5-dev,
   libmysqlclient-dev | libmysqlclient15-dev,
   libncurses5-dev,
   libpq-dev,
@@ -89,7 +89,7 @@ Suggests:
   wget | curl,
 # used by r.in.wms
   xml2
-Provides: grass642
+Provides: grass643
 Description: GRASS GIS core components
  Commonly referred to as GRASS, this is a Geographic Information
  System (GIS) used for geospatial data management and analysis,
diff --git a/debian/control.in b/debian/control.in
index 2cb89b8..4e10ba7 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -19,7 +19,7 @@ Build-depends:
   libglu1-mesa-dev | libglu1-xorg-dev, 
   libjpeg-dev,
   libpng-dev | libpng12-dev,
-  libtiff5-dev | libtiff4-dev,
+  libtiff-dev (>> 4.0.3-1~) | libtiff5-dev,
   libmysqlclient-dev | libmysqlclient15-dev,
   libncurses5-dev,
   libpq-dev,

-- 
Geographic Resources Analysis Support System