diff -u trac-git-0.0.20090320/debian/rules trac-git-0.0.20090320/debian/rules
--- trac-git-0.0.20090320/debian/rules
+++ trac-git-0.0.20090320/debian/rules
@@ -2,6 +2,7 @@
 
 PYVER=$(shell python -c 'import sys; print sys.version[:3]')
 
+include /usr/share/python/python.mk
 include $(CURDIR)/debian/update-patches.mk
 include /usr/share/quilt/quilt.make
 
@@ -31,7 +32,8 @@
 	dh_installdirs
 	cd 0.11 && python setup.py install \
 		--root=$(CURDIR)/debian/trac-git \
-		--single-version-externally-managed && cd ..
+		--single-version-externally-managed \
+		$(py_setup_install_args) && cd ..
 
 binary-indep: build install
 	dh_testdir
diff -u trac-git-0.0.20090320/debian/control trac-git-0.0.20090320/debian/control
--- trac-git-0.0.20090320/debian/control
+++ trac-git-0.0.20090320/debian/control
@@ -1,5 +1,6 @@
 Source: trac-git
-Maintainer: Jonny Lamb <jonny@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Jonny Lamb <jonny@debian.org>
 Section: python
 Priority: optional
 Build-Depends: debhelper (>= 5.0), quilt (>= 0.40)
diff -u trac-git-0.0.20090320/debian/changelog trac-git-0.0.20090320/debian/changelog
--- trac-git-0.0.20090320/debian/changelog
+++ trac-git-0.0.20090320/debian/changelog
@@ -1,3 +1,12 @@
+trac-git (0.0.20090320-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable (LP: #374946), remaining changes:
+    - debian/rules: Python 2.6 transition
+      + Include /usr/share/python/python.mk.
+      + Pass $(py_setup_install_args) macro to setup.py install.
+
+ -- Michael Terry <michael.terry@canonical.com>  Mon, 11 May 2009 11:23:53 -0400
+
 trac-git (0.0.20090320-1) unstable; urgency=low
 
   * New upstream snapshot.
@@ -26,6 +35,14 @@
 
  -- Jonny Lamb <jonny@debian.org>  Tue, 17 Feb 2009 20:17:52 +0000
 
+trac-git (0.0.20080710-3ubuntu1) jaunty; urgency=low
+
+  * Python 2.6 transition:
+    - Include /usr/share/python/python.mk.
+    - Pass $(py_setup_install_args) macro to setup.py install.
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Fri, 13 Mar 2009 16:16:41 +0000
+
 trac-git (0.0.20080710-3) unstable; urgency=medium
 
   * debian/control: