diff -pruN 5.4-2/debian/changelog 5.4-2ubuntu2/debian/changelog
--- 5.4-2/debian/changelog	2007-02-20 14:13:12.000000000 +0000
+++ 5.4-2ubuntu2/debian/changelog	2007-02-20 14:12:47.000000000 +0000
@@ -1,3 +1,16 @@
+diveintopython (5.4-2ubuntu2) feisty; urgency=low
+
+  * debian/control: Update maintainer fields according to debian-
+    maintainer-field spec.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 20 Feb 2007 12:27:20 +0000
+
+diveintopython (5.4-2ubuntu1) breezy; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 21 Jul 2005 17:41:15 +0200
+
 diveintopython (5.4-2) unstable; urgency=low
 
   * debian/watch: don't use .tgz, those files are not linked.
@@ -6,6 +19,12 @@ diveintopython (5.4-2) unstable; urgency
 
  -- Ross Burton <ross@debian.org>  Fri,  1 Jul 2005 09:21:41 +0100
 
+diveintopython (5.4-1ubuntu1) hoary; urgency=low
+
+  * Use bzip2 compression.
+
+ -- Thom May <thom@planetarytramp.net>  Mon,  6 Dec 2004 14:55:34 +0100
+
 diveintopython (5.4-1) unstable; urgency=low
 
   * New upstream release
diff -pruN 5.4-2/debian/control 5.4-2ubuntu2/debian/control
--- 5.4-2/debian/control	2007-02-20 14:13:12.000000000 +0000
+++ 5.4-2ubuntu2/debian/control	2007-02-20 14:12:47.000000000 +0000
@@ -1,11 +1,13 @@
 Source: diveintopython
 Section: doc
 Priority: optional
-Maintainer: Ross Burton <ross@debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Ross Burton <ross@debian.org>
 Build-Depends-Indep: debhelper (>= 4.0.0)
 Standards-Version: 3.6.1
 
 Package: diveintopython
+Pre-Depends: dpkg (>= 1.10.24)
 Architecture: all
 Recommends: python
 Description: free Python book for experienced programmers
diff -pruN 5.4-2/debian/rules 5.4-2ubuntu2/debian/rules
--- 5.4-2/debian/rules	2007-02-20 14:13:12.000000000 +0000
+++ 5.4-2ubuntu2/debian/rules	2007-02-20 14:12:47.000000000 +0000
@@ -35,7 +35,7 @@ binary-indep: install
 	dh_installdeb
 	dh_gencontrol
 	dh_md5sums
-	dh_builddeb
+	dh_builddeb -- -Zbzip2
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install
