[SCM] mapserver branch, master, updated. upstream/6.0.1-18-g05412de

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 05412de3c614480b50236a9dad6f4d8cebbf7eba
Merge: 20c41c275ab315d9e37c85e9ecc8da1b114a6e83 8ff8ae7148292c832ac68fb18c809557178f521d
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Fri Dec 23 10:26:53 2011 +0100

    Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/mapserver
    
    Conflicts:
    	debian/changelog
    	debian/control

diff --combined debian/changelog
index febd6d1,16dfe32..08bf575
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,16 +1,22 @@@
- mapserver (5.6.6-3) unstable; urgency=low
+ mapserver (6.0.1-1) unstable; urgency=low
+ 	
+   [ Alan Boudreault ]
+   * New upstream release.
  
+   [ 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. 
+   * Now mapscript/php3 moved finally to mapscript/php. Install file changed as
+     due.
 -
 - -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 21 Dec 2011 00:35:11 +0100
 +  * Removed obsolete python-docutils build-dep. Thanks Jakub Wilk.
 +    (closes: #635256)
 +  * Renamed perl-mapscript to libmapscript-perl to adhere the Perl naming
 +    policy.
 +    (closes: #575934)
 +  * Revised description of Perl mapscript.
 +
-  -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 27 Sep 2011 15:43:19 +0200
++ -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 23 Dec 2011 10:26:04 +0100
  
  mapserver (5.6.6-2) unstable; urgency=low
  
diff --combined debian/control
index 4424f9b,b0af902..c49b0e7
--- a/debian/control
+++ b/debian/control
@@@ -4,13 -4,14 +4,13 @@@ Priority: optiona
  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 (>= 7), libcurl4-gnutls-dev, libpng12-dev, zlib1g-dev (>= 1.1.4),
+ Build-Depends: debhelper (>= 8), libcurl4-gnutls-dev, libpng12-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 (>= 2.2.3-2),
   ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev,
   sharutils, libsdl1.2-dev, libfreetype6-dev, libx11-dev,
   libfcgi-dev, libxml2-dev, libogdi3.2-dev, libxslt1-dev, libpam0g-dev, libreadline-dev, 
-  libfribidi-dev, libming-dev, libedit-dev, libepsilon-dev
 - libfribidi-dev, libedit-dev, libepsilon-dev, libcairo2-dev
 -Build-Depends-Indep: python-docutils
++ libfribidi-dev, libming-dev, libedit-dev, libepsilon-dev, libcairo2-dev
  Build-Conflicts: libcurl3-openssl-dev
  Homepage: http://www.mapserver.org
  Vcs-Browser: http://git.debian.org/?p=pkg-grass/mapserver.git
@@@ -24,16 -25,13 +24,16 @@@ Suggests: mapserver-bin, mapserver-do
  Description: php5-cgi module for MapServer
   PHP MapScript provides MapServer functions for PHP scripts.
  
 -Package: perl-mapscript
 +Package: libmapscript-perl
  Section: perl
  Architecture: any
  Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
  Suggests: mapserver-bin, mapserver-doc
 -Description: Perl MapServer library
 - Perl MapScript provides MapServer functions for Perl scripts.
 +Provides: perl-mapscript
 +Replaces: perl-mapscript
 +Conflicts: perl-mapscript
 +Description: Perl MapServer module
 + Perl MapScript module provides MapServer functions for Perl scripts.
  
  Package: cgi-mapserver
  Section: web

-- 
Mapserver