[SCM] grass branch, master, updated. upstream/6.4.1-110-g305d985

[M. Hamish Bowman]

The following commit has been merged in the master branch:
commit 305d98509d574c870b3626514d3e0645f1f790a4
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date:   Sat Jun 9 17:24:56 2012 +1200

    build-depends on libpng-dev for their transition

diff --git a/debian/changelog b/debian/changelog
index 786da04..a7049ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grass (6.4.2-3) unstable; urgency=low
+
+  * Build-Depends on libpng-dev for LibPNG transition.
+    (closes: #662361)
+
+ -- M. Hamish Bowman <hamish_b at yahoo.com>  Sat, 09 Jun 2012 17:15:10 +1200
+
 grass (6.4.2-2) unstable; urgency=low
 
   * Now grass-gui replacing/breaking old grass.
diff --git a/debian/control b/debian/control
index 4effffb..710eba1 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,9 @@ Build-depends:
   libfreetype6-dev,
   libgdal-dev| libgdal1-dev (>= 1.5.0),
   libglu1-mesa-dev | libglu1-xorg-dev, 
-  libjpeg-dev, libpng12-dev, libtiff5-dev | libtiff4-dev,
+  libjpeg-dev,
+  libpng-dev | libpng12-dev,
+  libtiff5-dev | libtiff4-dev,
   libmysqlclient-dev | libmysqlclient15-dev,
   libncurses5-dev,
   libpq-dev,
diff --git a/debian/control.in b/debian/control.in
index 11c4b56..4297976 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -16,7 +16,9 @@ Build-depends:
   libfreetype6-dev,
   libgdal-dev| libgdal1-dev (>= 1.5.0),
   libglu1-mesa-dev | libglu1-xorg-dev, 
-  libjpeg-dev, libpng12-dev, libtiff5-dev | libtiff4-dev,
+  libjpeg-dev,
+  libpng-dev | libpng12-dev,
+  libtiff5-dev | libtiff4-dev,
   libmysqlclient-dev | libmysqlclient15-dev,
   libncurses5-dev,
   libpq-dev,

-- 
Geographic Resources Analysis Support System