[SCM] mapserver branch, master, updated. upstream/6.0.1-29-g379df24

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit d3373f80051daeb3d4257b5031e9d79d926627d1
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Mar 14 21:44:55 2012 +0100

    Fixed #663875

diff --git a/debian/changelog b/debian/changelog
index 32f5798..55aabda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mapserver (6.0.1-4) unstable; urgency=low
+
+  * Fixed typo that prevented AGG use in debian/rules.
+    (closes: #663875)
+  * Now using libpng-dev as b-d.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 14 Mar 2012 21:43:53 +0100
+
 mapserver (6.0.1-3) unstable; urgency=low
 
   * Let the configure script search in the system directory for jpeg stuff.
diff --git a/debian/control b/debian/control
index fafe3e6..9f7683e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>, Alan Boudreault <aboudreault at mapgears.com>
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 8), libcurl4-gnutls-dev, libpng12-dev, zlib1g-dev (>= 1.1.4),
+Build-Depends: debhelper (>= 8), libcurl4-gnutls-dev, libpng-dev, zlib1g-dev (>= 1.1.4),
  libgd2-xpm-dev (>= 2.0.1-10), libfreetype6-dev (>= 2.0.9), libjpeg-dev, libgdal1-dev (>=1.4.0), libproj-dev,
  libpq-dev, php5-dev, swig, python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~), libgeos-dev (>= 3.3.1-1~),
  ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev,

-- 
Mapserver