[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 9724db5647c1b86d2b24e713dbf7ae5d99c7f5fd
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Dec 21 00:18:20 2011 +0100

    Fixed PNG support.

diff --git a/debian/changelog b/debian/changelog
index c9be686..b7ea541 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ 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.
+  * Removed explicit settings of png dir, it collids with multi-arch support. 
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 20 Dec 2011 23:21:53 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 21 Dec 2011 00:01:23 +0100
 
 mapserver (5.6.6-2) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 5cdd6dd..c9e253e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,6 @@ COMMON_CONFIG=	--prefix=/usr \
 		--with-freetype=/usr \
 		--with-fribidi-config \
 		--with-zlib=/usr \
-		--with-png=/usr \
 		--with-xpm=/usr \
 		--with-jpeg=/usr \
 		--with-gdal \
@@ -50,10 +49,9 @@ COMMON_CONFIG=	--prefix=/usr \
 		--with-threads \
 		--with-geos \
 		--with-fastcgi \
-		--with-agg \
+		-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