diff -Nru trac-git-0.0.20100513/debian/changelog trac-git-0.0.20100513/debian/changelog
--- trac-git-0.0.20100513/debian/changelog	2010-06-17 14:07:52.000000000 +0200
+++ trac-git-0.0.20100513/debian/changelog	2010-07-20 10:33:36.000000000 +0200
@@ -1,3 +1,9 @@
+trac-git (0.0.20100513-2ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable (LP: #607625)
+
+ -- David Sugar <david.sugar@canonical.com>  Tue, 20 Jun 2010 10:23:42 +0200
+
 trac-git (0.0.20100513-2) unstable; urgency=low
 
   * debian/control: Make Python-Version >= 2.5, not = 2.5, to make it
@@ -14,6 +20,20 @@
 
  -- Jonny Lamb <jonny@debian.org>  Thu, 13 May 2010 09:09:20 +0100
 
+trac-git (0.0.20090320-1ubuntu2) lucid; urgency=low
+
+  * allow the package to work with python >= 2.5. LP: #388911
+
+ -- Reinhard Tartler <siretart@tauware.de>  Wed, 02 Dec 2009 18:20:53 +0100
+
+trac-git (0.0.20090320-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable (LP: #378375), remaining changes:
+    - Include /usr/share/python/python.mk.
+    - Pass $(py_setup_install_args) macro to setup.py install.
+
+ -- Marco Simonelli <sumydi@gmail.com>  Tue, 19 May 2009 18:17:26 +0200
+
 trac-git (0.0.20090320-1) unstable; urgency=low
 
   * New upstream snapshot.
@@ -42,6 +62,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: 
@@ -96,3 +124,4 @@
   * Initial release. (Closes: #482334)
 
  -- Jonny Lamb <jonnylamb@jonnylamb.com>  Mon, 19 May 2008 14:33:23 +0100
+
diff -Nru trac-git-0.0.20100513/debian/control trac-git-0.0.20100513/debian/control
--- trac-git-0.0.20100513/debian/control	2010-06-17 14:07:52.000000000 +0200
+++ trac-git-0.0.20100513/debian/control	2010-07-20 10:12:44.000000000 +0200
@@ -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)
diff -Nru trac-git-0.0.20100513/debian/rules trac-git-0.0.20100513/debian/rules
--- trac-git-0.0.20100513/debian/rules	2010-06-17 14:07:52.000000000 +0200
+++ trac-git-0.0.20100513/debian/rules	2010-06-17 20:23:42.000000000 +0200
@@ -2,6 +2,8 @@
 
 PYVER=$(shell python -c 'import sys; print sys.version[:3]')
 
+
+include /usr/share/python/python.mk
 include $(CURDIR)/debian/update-patches.mk
 
 clean:
@@ -30,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