diff -pruN 0.svn288-1/debian/changelog 0.svn288-1ubuntu2/debian/changelog
--- 0.svn288-1/debian/changelog	2010-09-27 12:55:59.000000000 +0100
+++ 0.svn288-1ubuntu2/debian/changelog	2010-12-09 16:56:37.000000000 +0000
@@ -1,3 +1,18 @@
+serna-free (0.svn288-1ubuntu2) natty; urgency=low
+
+  * Rebuild with python 2.7 as the python default.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 09 Dec 2010 16:56:37 +0000
+
+serna-free (0.svn288-1ubuntu1) natty; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - Build-Depends on libqtassistantclient-dev instead of the no longer
+      existing libqt4-assistant to fix FTBFS
+    - Recommends qt-assistant-compat
+
+ -- Felix Geyer <debfx-pkg@fobos.de>  Wed, 20 Oct 2010 22:16:40 +0200
+
 serna-free (0.svn288-1) unstable; urgency=low
 
   * New upstream release, 1 patch applied upstream.
@@ -6,6 +21,14 @@ serna-free (0.svn288-1) unstable; urgenc
 
  -- Joachim Breitner <nomeata@debian.org>  Mon, 27 Sep 2010 13:55:59 +0200
 
+serna-free (0.svn270-3ubuntu1) maverick; urgency=low
+
+  * Build-Depends on libqtassistantclient-dev instead of the no longer
+    existing libqt4-assistant to fix FTBFS
+  * Recommends qt-assistant-compat
+
+ -- Alessandro Ghersi <alessandro-ghersi@kubuntu.org>  Sun, 26 Sep 2010 04:41:53 +0200
+
 serna-free (0.svn270-3) unstable; urgency=low
 
   * Add Build-Conflicts on qt3-dev-tools, to avoid FTBFS
diff -pruN 0.svn288-1/debian/control 0.svn288-1ubuntu2/debian/control
--- 0.svn288-1/debian/control	2010-04-17 16:28:27.000000000 +0100
+++ 0.svn288-1ubuntu2/debian/control	2010-10-20 20:46:49.000000000 +0100
@@ -1,7 +1,8 @@
 Source: serna-free
 Section: text
 Priority: extra
-Maintainer: Joachim Breitner <nomeata@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Joachim Breitner <nomeata@debian.org>
 Build-Depends:
  debhelper (>= 7.0.50~),
  python,
@@ -13,7 +14,7 @@ Build-Depends:
  qt4-qmake,
  qt4-dev-tools,
  python-sip-dev,
- libqt4-assistant,
+ libqtassistantclient-dev,
  libx11-dev,
  x11proto-core-dev,
  libfreetype6-dev,
@@ -48,6 +49,7 @@ Depends:
  ${sip:Depends},
 Recommends:
  fop,
+ qt-assistant-compat
 Description: Graphical XML editor
  Serna Free Open Source XML editor is an easy-to-use visual XML
  application which requires virtually no technical experience from