diff -u python-clientform-0.2.9/debian/control python-clientform-0.2.9/debian/control
--- python-clientform-0.2.9/debian/control
+++ python-clientform-0.2.9/debian/control
@@ -1,10 +1,11 @@
 Source: python-clientform
 Section: python
 Priority: extra
-Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers@lists.alioth.debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers@lists.alioth.debian.org>
 Uploaders: Brian Sutherland <jinty@web.de>, Fabio Tranchitella <kobold@debian.org>, Jérémy Bobbio <lunar@debian.org>
-Build-Depends-Indep: python (>= 2.3.5-7), python-all-dev, python-central (>= 0.5)
-Build-Depends: debhelper (>= 5.0.37.2), python-setuptools (>= 0.6a9)
+Build-Depends-Indep: python-central (>= 0.5)
+Build-Depends: debhelper (>= 5.0.37.2), python-setuptools (>= 0.6a9), python-all-dev (>= 2.3.5-7)
 Standards-Version: 3.8.0
 Homepage: http://wwwsearch.sourceforge.net/ClientForm/
 XS-Python-Version: all
diff -u python-clientform-0.2.9/debian/changelog python-clientform-0.2.9/debian/changelog
--- python-clientform-0.2.9/debian/changelog
+++ python-clientform-0.2.9/debian/changelog
@@ -1,3 +1,11 @@
+python-clientform (0.2.9-1ubuntu1) jaunty; urgency=low
+
+  * Python 2.6 transition (fixes FTBFS) (lp: #348949)
+  * Merge the build-dependency on python and python-all-dev to python-all-dev
+    and move it from Build-Depends-Indep to Build-Depends.
+
+ -- Michael Bienia <geser@ubuntu.com>  Thu, 26 Mar 2009 13:32:00 +0100
+
 python-clientform (0.2.9-1) unstable; urgency=low
 
   * New upstream release.
diff -u python-clientform-0.2.9/debian/rules python-clientform-0.2.9/debian/rules
--- python-clientform-0.2.9/debian/rules
+++ python-clientform-0.2.9/debian/rules
@@ -3,6 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/python/python.mk
+
 PYVERS=$(shell pyversions -vr debian/control)
 PYMOD=ClientForm
 PACKAGE=python-clientform
@@ -40,10 +42,10 @@
 	$(MAKE) -f debian/rules $(PYVERS:%=install-python%)
 
 install-python%:
-	python$* setup.py install --no-compile --single-version-externally-managed --root=debian/$(PACKAGE)
+	python$* setup.py install --no-compile --single-version-externally-managed --root=debian/$(PACKAGE) $(py_setup_install_args)
 	# Remove python and module version from .egg-info
-	mv debian/$(PACKAGE)/usr/lib/python$*/site-packages/$(PYMOD)-$(DEB_UPSTREAM_VERSION)-py$*.egg-info \
-	   debian/$(PACKAGE)/usr/lib/python$*/site-packages/$(PYMOD).egg-info 
+	mv debian/$(PACKAGE)/$(call py_libdir,$*)/$(PYMOD)-$(DEB_UPSTREAM_VERSION)-py$*.egg-info \
+	   debian/$(PACKAGE)/$(call py_libdir,$*)/$(PYMOD).egg-info 
 
 .PHONY: binary-common
 binary-common: