diff -u rdflib-2.4.0/debian/changelog rdflib-2.4.0/debian/changelog
--- rdflib-2.4.0/debian/changelog
+++ rdflib-2.4.0/debian/changelog
@@ -1,3 +1,12 @@
+rdflib (2.4.0-3ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Build-depend on python-support >= 0.6.4.
+    - Use unversioned python as interpreter for /usr/bin/rdfpipe.
+    - Maintainer field in debian/control
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Sun, 27 May 2007 22:38:51 +0100
+
 rdflib (2.4.0-3) unstable; urgency=low
 
   * debian/pyversions
@@ -10,6 +19,16 @@
 
  -- Nacho Barrientos Arias <nacho@debian.org>  Sun, 27 May 2007 14:01:07 +0200
 
+rdflib (2.4.0-2ubuntu1) gutsy; urgency=low
+
+  * Support also python2.5:
+    - Build-depend on pyhton-all-dev and python-support >= 0.6.4.
+    - Remove the .egg-info renaming (done now by python-support).
+    - Use unversioned python as interpreter for /usr/bin/rdfpipe.
+  * debian/control: Change Maintainer/XSBC-Original-Maintainer field.
+
+ -- Michael Bienia <geser@ubuntu.com>  Fri, 25 May 2007 15:29:07 +0200
+
 rdflib (2.4.0-2) unstable; urgency=medium
 
   * debian/control
@@ -45,0 +65 @@
+
diff -u rdflib-2.4.0/debian/control rdflib-2.4.0/debian/control
--- rdflib-2.4.0/debian/control
+++ rdflib-2.4.0/debian/control
@@ -1,8 +1,9 @@
 Source: rdflib
 Section: python
 Priority: optional
-Maintainer: Nacho Barrientos Arias <nacho@debian.org>
-Build-Depends: debhelper (>= 5), python-all-dev, python-support (>= 0.3), quilt (>= 0.40), python-setuptools
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Nacho Barrientos Arias <nacho@debian.org>
+Build-Depends: debhelper (>= 5), python-all-dev, python-support (>= 0.6.4), quilt (>= 0.40), python-setuptools
 Standards-Version: 3.7.2
 
 Package: python-rdflib
diff -u rdflib-2.4.0/debian/rules rdflib-2.4.0/debian/rules
--- rdflib-2.4.0/debian/rules
+++ rdflib-2.4.0/debian/rules
@@ -35,6 +35,7 @@
 	rm -rf $(CURDIR)/debian/python-rdflib/usr/lib/python$*/site-packages/test
 	mv $(CURDIR)/debian/python-rdflib/usr/lib/python$*/site-packages/rdflib-${UPSTREAM_VERSION}-py*.egg-info \
 			$(CURDIR)/debian/python-rdflib/usr/lib/python$*/site-packages/rdflib-${UPSTREAM_VERSION}.egg-info
+	sed -i -e "s#\(/usr/bin/python\).*#\1#" $(CURDIR)/debian/python-rdflib/usr/bin/rdfpipe
 	touch $@
 
 binary-indep: build install