[SCM] mapserver branch, master, updated. upstream/6.2.1-58-g2519c98

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 7b9c87512d9a7422bbf50dbb2178569a8f9c573d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jun 15 00:43:03 2013 +0200

    Use --install-layout=deb for python setup.py.

diff --git a/debian/changelog b/debian/changelog
index 637118a..11568c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low
   * Additional cleanup to allow building twice.
   * Remove unused shlibs:Depends.
   * shp2mysql was removed, no more perl in mapserver-bin.
+  * Use --install-layout=deb for python setup.py.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 14 Jun 2013 22:00:07 +0200
 
diff --git a/debian/rules b/debian/rules
index 6e04f1c..653e461 100755
--- a/debian/rules
+++ b/debian/rules
@@ -163,7 +163,7 @@ install-arch-stamp: build-arch
 	# Python mapscript
 	cd $(CURDIR)/mapscript/python && set -e ; \
 	  for python in $(PYVERS); do \
-	    $$python setup.py install --root=$(CURDIR)/debian/python-mapscript ; \
+	    $$python setup.py install --install-layout=deb --root=$(CURDIR)/debian/python-mapscript ; \
 	  done
 
 	# Ruby mapscript

-- 
Mapserver