[SCM] mapserver branch, master, updated. upstream/6.0.1-15-g9724db5

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 19dbf050045f1b1298f881c488229eff42ccca08
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Dec 20 23:47:45 2011 +0100

    Removed experimental PNG 1.5 support.

diff --git a/debian/changelog b/debian/changelog
index e045156..c9be686 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ mapserver (6.0.1-1) unstable; urgency=low
 
   [ Francesco Paolo Lovergine ]
   * Debhelper level set to 8.
+  * This version still uses libpng 1.2, but is ready also for 1.5.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 20 Dec 2011 23:21:53 +0100
 
diff --git a/debian/rules b/debian/rules
index 2e49c52..5cdd6dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,8 +51,9 @@ COMMON_CONFIG=	--prefix=/usr \
 		--with-geos \
 		--with-fastcgi \
 		--with-agg \
-		--with-experimental-png \
 		--with-cairo
+#This is required only for PNG 1.5+
+#		--with-experimental-png \
 
 rstoptions=--stylesheet=mapscript.css --link-stylesheet 
 

-- 
Mapserver