[SCM] grass branch, master, updated. upstream/6.4.1-124-g3e0161d

[M. Hamish Bowman]

The following commit has been merged in the master branch:
commit 3e0161dac38aa759e00e04b351772e8900239b2f
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date:   Wed Sep 11 21:18:25 2013 +1200

    Prepare for libtiff-dev transition. Keep libtiff5-dev first in the OR series otherwise it auto-pulls in libtiff4-dev which doesn't support BigTiff. (see http://debian-release/2013/05/msg00127.html)

diff --git a/debian/changelog b/debian/changelog
index a7ba1bc..1d49914 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ grass (6.4.3-1) unstable; urgency=low
   * Build-Depends on libmotif-dev for Motif transition.
     (closes: #714679)
   * 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>  Tue, 10 Sep 2013 12:50:42 +1200
+ -- M. Hamish Bowman <hamish_b at yahoo.com>  Wed, 11 Sep 2013 14:17:50 +1200
 
 grass (6.4.2-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c0e8c56..159729a 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 | libtiff4-dev,
+  libtiff5-dev | libtiff-dev | libtiff4-dev,
   libmysqlclient-dev | libmysqlclient15-dev,
   libncurses5-dev,
   libpq-dev,

-- 
Geographic Resources Analysis Support System