diff -u mapnik-0.5.1/debian/control mapnik-0.5.1/debian/control
--- mapnik-0.5.1/debian/control
+++ mapnik-0.5.1/debian/control
@@ -2,10 +2,10 @@
 Priority: optional
 Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
 XSBC-Original-Maintainer: Dominic Hargreaves <dom@earth.li>
-Build-Depends: libboost-thread-dev (>= 1.34.0), libboost-filesystem-dev (>= 1.34.0), libboost-regex-dev (>= 1.34.0), libboost-program-options-dev (>= 1.34.0), libboost-python-dev (>= 1.34.1-9), libpng12-dev, libjpeg62-dev, libtiff4-dev, zlib1g-dev, libfreetype6-dev, libpq-dev, proj, libltdl7-dev, libfribidi-dev, python, debhelper (>= 5.0.38), python2.5-dev, python-central (>= 0.5.6), libgdal1-dev, libxml2-dev, libagg-dev, libboost-iostreams-dev (>= 1.34.0), quilt, scons
+Build-Depends: libboost-thread-dev (>= 1.34.0), libboost-filesystem-dev (>= 1.34.0), libboost-regex-dev (>= 1.34.0), libboost-program-options-dev (>= 1.34.0), libboost-python-dev (>= 1.34.1-9), libpng12-dev, libjpeg62-dev, libtiff4-dev, zlib1g-dev, libfreetype6-dev, libpq-dev, proj, libltdl7-dev, libfribidi-dev, python, debhelper (>= 5.0.38), python-all-dev (>= 2.5.4-1~), python-central (>= 0.5.6), libgdal1-dev, libxml2-dev, libagg-dev, libboost-iostreams-dev (>= 1.34.0), quilt, scons
 Standards-Version: 3.8.0
 Section: libs
-XS-Python-Version: 2.5
+XS-Python-Version: >= 2.5
 Homepage: http://www.mapnik.org/
 
 Package: libmapnik0.5
diff -u mapnik-0.5.1/debian/rules mapnik-0.5.1/debian/rules
--- mapnik-0.5.1/debian/rules
+++ mapnik-0.5.1/debian/rules
@@ -13,8 +13,10 @@
 
 GDAL_LIBNAME=$(subst -l,,$(filter -lgdal%,$(shell gdal-config --libs)))
 
+PYVERS=$(shell pyversions -vr)
+
 # scons flags
-SCONS_FLAGS=PROJ_INCLUDES=/usr/include PGSQL_INCLUDES=/usr/include/postgresql PROJ_LIBS=/usr/lib GDAL_INCLUDES=/usr/include/gdal DESTDIR=$(CURDIR)/debian/tmp PREFIX=/usr BIDI=yes PYTHON=/usr/bin/python2.5 XMLPARSER=libxml2 GDAL_LIBNAME=$(GDAL_LIBNAME)
+SCONS_FLAGS=PROJ_INCLUDES=/usr/include PGSQL_INCLUDES=/usr/include/postgresql PROJ_LIBS=/usr/lib GDAL_INCLUDES=/usr/include/gdal DESTDIR=$(CURDIR)/debian/tmp PREFIX=/usr BIDI=yes XMLPARSER=libxml2 GDAL_LIBNAME=$(GDAL_LIBNAME)
 
 CFLAGS = -Wall -g
 
@@ -31,23 +33,27 @@
 
 	touch configure-stamp
 
+build-%/configure-stamp: patch
+	dh_testdir
+	mkdir -p build-$*
+	touch $@
 
-build: build-stamp
-build-stamp: patch configure-stamp 
+build: $(PYVERS:%=build-%/build-stamp)
+build-%/build-stamp: build-%/configure-stamp 
 	dh_testdir
 
 	# Add here commands to compile the package.
-	scons $(SCONS_FLAGS)
+	scons $(SCONS_FLAGS) PYTHON=/usr/bin/python$*
 	touch $@
 
 clean: unpatch
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
+	rm -Rf build-*
 
 	# Add here commands to clean up after the build process.
 	#-$(MAKE) clean
-	scons $(SCONS_FLAGS) --clean
+	-scons $(SCONS_FLAGS) PYTHON=/usr/bin/python$* --clean
 	rm -rf .sconf_temp
 	find -name '*.pyc' -exec rm -f {} \;
 	rm -f config.log bindings/python/mapnik/paths.py 
@@ -60,14 +66,15 @@
 
 	dh_clean 
 
-install: build
+install: build $(PYVERS:%=install-%)
+install-%:
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	#dh_clean -k 
 	dh_installdirs
 
 	# Add here commands to install the package into debian/tmp
-	scons $(SCONS_FLAGS) install
+	scons $(SCONS_FLAGS) PYTHON=/usr/bin/python$*  install
 	find $(CURDIR)/debian/tmp -name '.sconsign' -exec rm -f {} \;
 	install -d $(CURDIR)/debian/tmp/usr/bin
 	install -m 0755 debian/mapnik-plugin-base $(CURDIR)/debian/tmp/usr/bin
diff -u mapnik-0.5.1/debian/changelog mapnik-0.5.1/debian/changelog
--- mapnik-0.5.1/debian/changelog
+++ mapnik-0.5.1/debian/changelog
@@ -1,3 +1,14 @@
+mapnik (0.5.1-3ubuntu2.1) jaunty-proposed; urgency=low
+
+  * Finish of the python 2.6 transition (LP: #354205)
+    - debian/control
+      + Change bdeps from python2.5-dev to python-all-dev (>= 2.5)
+      + Change XS-Python-Version from 2.5 to >= 2.5
+    - debian/rules:
+      + Various changes to enable python2.5 and python2.6 builds
+
+ -- Christophe Sauthier <christophe.sauthier@objectif-libre.com>  Fri, 01 May 2009 17:45:42 +0200
+
 mapnik (0.5.1-3ubuntu2) jaunty; urgency=low
 
   * Python 2.6 transition: