[SCM] mapnik branch, master, updated. debian/0.7.1-5-16-g061fdad

[David Paleino]

The following commit has been merged in the master branch:
commit e964b584fd774f1a7c530bcf07e6b8fba0ca52b5
Author: David Paleino <dapal at debian.org>
Date:   Mon Sep 26 23:52:20 2011 +0200

    Package switch from pysupport to dh_python2

diff --git a/debian/changelog b/debian/changelog
index c12c079..512196e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ mapnik (2.0.0-1) UNRELEASED; urgency=low
   * New upstream version
   * Debhelper compatibility bumped to 8
   * New input plugins compiled: geos, rasterlite
+  * Package switch from pysupport to dh_python2
 
- -- David Paleino <dapal at debian.org>  Mon, 26 Sep 2011 23:49:50 +0200
+ -- David Paleino <dapal at debian.org>  Mon, 26 Sep 2011 23:52:10 +0200
 
 mapnik (0.7.1-6) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 809b01c..a3b21ff 100644
--- a/debian/control
+++ b/debian/control
@@ -6,10 +6,9 @@ Uploaders: Debian OpenStreetMap Team <pkg-osm-maint at lists.alioth.debian.org>
  , Francesco Paolo Lovergine <frankie at debian.org>
 Build-Depends:
  scons
-# , python-support (>= 0.90.0~)
  , debhelper (>= 8~)
  , libtool
- , python-all-dev
+ , python-all-dev (>= 2.6.6-3~)
  , libboost-thread-dev
  , libboost-filesystem-dev
  , libboost-regex-dev
@@ -41,7 +40,7 @@ Build-Depends:
  , pkg-config
 Standards-Version: 3.9.2
 Section: libs
-XS-Python-Version: >= 2.5
+X-Python-Version: >= 2.5
 Homepage: http://www.mapnik.org/
 Vcs-Git: git://git.debian.org/pkg-grass/mapnik.git
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/mapnik.git
@@ -149,7 +148,6 @@ Depends:
  , ${python:Depends}
  , python-cairo
 Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
 Description: C++/Python toolkit for developing GIS applications (Python)
  Mapnik is an OpenSource C++/Python toolkit for developing GIS
  (Geographic Information Systems) applications. At the core is a C++
diff --git a/debian/rules b/debian/rules
index e8d2c3c..b94fcad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,4 +65,5 @@ override_dh_installexamples:
 %:
 #	dh_installexamples -Xdata/new
 #	dh_install --sourcedir=debian/tmp
-	dh $@
+	dh $@ \
+		--with python2

-- 
C++/Python toolkit for developing GIS applications