[SCM] grass branch, master, updated. upstream/6.4.1-89-gb075f21

[M. Hamish Bowman]

The following commit has been merged in the master branch:
commit b075f211778d902edbab0cf3ae8db4a5bcfb7611
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date:   Tue Feb 28 00:20:36 2012 +1300

    allow older distro users to use the same pkg controls unmodified (.in)

diff --git a/debian/control.in b/debian/control.in
index 7fc23c8..4742576 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -16,8 +16,8 @@ Build-depends:
   libfreetype6-dev,
   libgdal1-dev (>= 1.5.0),
   libglu1-mesa-dev | libglu1-xorg-dev, 
-  libjpeg-dev, libpng12-dev, libtiff5-dev,
-  libmysqlclient-dev,
+  libjpeg-dev, libpng12-dev, libtiff5-dev | libtiff4-dev,
+  libmysqlclient-dev | libmysqlclient15-dev,
   libncurses5-dev,
   libpq-dev,
 # proj-bin needed for nad2bin during config

-- 
Geographic Resources Analysis Support System