[SCM] grass branch, master, updated. upstream/6.4.1-77-gecd8063

[Francesco P. Lovergine]

The following commit has been merged in the master branch:
commit ecd806309c1310791ad842fd08facc73f849ee11
Author: Francesco P. Lovergine <francesco at lovergine.com>
Date:   Sat Feb 25 19:00:35 2012 +0100

    Updated a couple of b-ds.

diff --git a/debian/changelog b/debian/changelog
index e20b246..f1828f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 grass (6.4.2-1) unstable; urgency=low
 
+  [ M. Hamish Bowman ]
   * Packaged new upstream version.
   * Reorganize binary packages, new: grass-core, grass-gui, grass-dev-doc.
   * Patch g.extension.sh to check for the needed grass-dev package.
@@ -12,7 +13,12 @@ grass (6.4.2-1) unstable; urgency=low
     (closes: #615667)
   * Policy bumped to 3.9.3, using metapackages archive section for 'grass'.
 
- -- M. Hamish Bowman <hamish_b at yahoo.com>  Sat, 25 Feb 2012 22:49:50 +1300
+  [ Francesco Paolo Lovergine ]
+  * Moved to use TIFF 4.0.1 instead of the legacy flavor.
+  * B-D updated to libmysqlclient-dev to pickup current version.
+    (closes: #650361)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Sat, 25 Feb 2012 18:55:41 +0100
 
 grass (6.4.1-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 136e4cb..e29662f 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-depends:
   libfreetype6-dev,
   libgdal1-dev (>= 1.5.0),
   libglu1-mesa-dev | libglu1-xorg-dev, 
-  libjpeg-dev, libpng12-dev, libtiff4-dev,
+  libjpeg-dev, libpng12-dev, libtiff5-dev,
   libmysqlclient-dev,
   libncurses5-dev,
   libpq-dev,
@@ -25,25 +25,23 @@ Build-depends:
   libreadline-dev | libreadline6-dev,
   libsqlite3-dev,
   libxmu-dev,
-#install optipng if compressing the PNG images in the programmers' manual
-#  optipng,
   python-dev (>= 2.5), python-support (>= 0.7.1),
   python-wxgtk2.8, libwxgtk2.8-dev,
   tcl-dev (>= 8.5), tk-dev (>= 8.5),
   unixodbc-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.2
 Build-Conflicts: wx2.6-headers
 Homepage: http://grass.osgeo.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/grass.git
 Vcs-Git: git://git.debian.org/git/pkg-grass/grass.git
 
 Package: grass
-Section: metapackages
+Section: science
 Architecture: all
 Depends: grass-core, grass-gui
 Recommends: grass-doc
 Suggests: grass-dev
-Description: Geographic Resources Analysis Support System (GRASS GIS)
+Description: GRASS GIS (The Geographic Resources Analysis Support System)
  Commonly referred to as GRASS, this is a Geographic Information
  System (GIS) used for geospatial data management and analysis,
  image processing, graphics/map production, spatial modeling, and
@@ -83,7 +81,7 @@ Suggests:
   wget | curl,
 # used by r.in.wms
   xml2
-Provides: grass642
+Provides: grass641
 Description: GRASS GIS core components
  Commonly referred to as GRASS, this is a Geographic Information
  System (GIS) used for geospatial data management and analysis,
@@ -138,9 +136,9 @@ Description: GRASS GIS user documentation
 Package: grass-dev-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}, libjs-jquery
+Depends: ${misc:Depends}
 Suggests: grass
-Description: GRASS GIS Programmers' Manual
+Description: The GRASS GIS Programmers' Manual
  Commonly referred to as GRASS, this is a Geographic Information
  System (GIS) used for geospatial data management and analysis,
  image processing, graphics/map production, spatial modeling, and
diff --git a/debian/control.in b/debian/control.in
index 76274bb..f7494f8 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, libtiff4-dev,
-  libmysqlclient15-dev,
+  libjpeg-dev, libpng12-dev, libtiff5-dev,
+  libmysqlclient-dev,
   libncurses5-dev,
   libpq-dev,
 # proj-bin needed for nad2bin during config

-- 
Geographic Resources Analysis Support System