[SCM] mapserver branch, master, updated. upstream/6.0.1-16-g8ff8ae7

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 8ff8ae7148292c832ac68fb18c809557178f521d
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Dec 21 00:35:55 2011 +0100

    Fixed another silly FTBS.

diff --git a/debian/changelog b/debian/changelog
index b7ea541..16dfe32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ mapserver (6.0.1-1) unstable; urgency=low
   * 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:01:23 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 21 Dec 2011 00:35:11 +0100
 
 mapserver (5.6.6-2) unstable; urgency=low
 
diff --git a/debian/php5-mapscript.docs b/debian/php5-mapscript.docs
index 30c4d19..30d68c0 100644
--- a/debian/php5-mapscript.docs
+++ b/debian/php5-mapscript.docs
@@ -1 +1 @@
-mapscript/php3/README
+mapscript/php/README

-- 
Mapserver