diff -u vdr-1.6.0/debian/changelog vdr-1.6.0/debian/changelog
--- vdr-1.6.0/debian/changelog
+++ vdr-1.6.0/debian/changelog
@@ -1,3 +1,10 @@
+vdr (1.6.0-18ubuntu1) maverick; urgency=low
+
+  * Merge from Debian Unstable (LP: #622181), remaining changes:
+    - Remove po/vdr.pot after build.
+
+ -- Bilal Akhtar <bilalakhtar@ubuntu.com>  Sun, 22 Aug 2010 13:52:29 +0300
+
 vdr (1.6.0-18) unstable; urgency=low
 
   * Added Danish translation of the debconf templates (Thx to Joe Hansen)
@@ -7,6 +14,15 @@
 
  -- Tobias Grimm <etobi@debian.org>  Thu, 19 Aug 2010 00:07:33 +0200
 
+vdr (1.6.0-17ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - Recommend ttf-dejavu instead of ttf-bitstream-vera as it has been
+      removed from karmic.
+    - Remove po/vdr.pot after build.
+
+ -- Andreas Wenning <awen@awen.dk>  Mon, 24 May 2010 02:47:44 +0200
+
 vdr (1.6.0-17) unstable; urgency=low
 
   * Modified runvdr to also (re)load dvb modules not depending on dvb_core*
@@ -97,6 +113,33 @@
 
  -- Tobias Grimm <etobi@debian.org>  Fri, 10 Jul 2009 20:24:50 +0200
 
+vdr (1.6.0-9ubuntu2) karmic; urgency=low
+
+  * Fix FTBFS with gcc 4.4
+    - Add 20_gcc44_ftbfs.dpatch - Thanks Fedora
+    - Modify debian/patches/opt-20_liemikuutio.dpatch
+    - Run debian/rules accept-patches to update the list of accepted
+      patches.
+  * Recommend ttf-dejavu instead of ttf-bitstream-vera as it has been
+    removed from karmic (LP: #434176)
+
+ -- Felix Geyer <debfx-pkg@fobos.de>  Mon, 21 Sep 2009 22:36:10 +0200
+
+vdr (1.6.0-9ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable (LP: #325277, #360552), remaining changes:
+    - Enabled patches:
+      - opt-20_liemikuutio
+      - opt-24_jumpplay
+      - opt-27_ttxtsubs
+      - opt-42-x_MainMenuHooks
+      - opt-51_cuttime
+    - Run debian/rules accept-patches to update the list of accepted
+      patches.
+    - Remove po/vdr.pot after build.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Mon, 13 Apr 2009 19:20:49 +0300
+
 vdr (1.6.0-9) unstable; urgency=low
 
   [ Tobias Grimm ]
@@ -154,6 +197,26 @@
 
  -- Tobias Grimm <tg@e-tobi.net>  Sun, 24 Aug 2008 23:13:44 +0200
 
+vdr (1.6.0-5ubuntu2) intrepid; urgency=low
+
+  * Run debian/rules accept-patch to update the list of accepted patches.
+    (FTBFS)
+  * debian/rules: Fix the comparison of patch lists.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Wed, 13 Aug 2008 13:20:22 +0300
+
+vdr (1.6.0-5ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Enabled patches:
+      - opt-20_liemikuutio
+      - opt-24_jumpplay
+      - opt-27_ttxtsubs
+      - opt-42-x_MainMenuHooks
+      - opt-51_cuttime
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Wed, 13 Aug 2008 12:47:30 +0300
+
 vdr (1.6.0-5) unstable; urgency=low
 
   [ Thomas Schmidt ]
@@ -169,6 +232,18 @@
 
  -- Thomas Schmidt <tschmidt@debian.org>  Sat, 19 Jul 2008 16:25:21 +0200
 
+vdr (1.6.0-4ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Enabled patches:
+      - opt-20_liemikuutio
+      - opt-24_jumpplay
+      - opt-27_ttxtsubs
+      - opt-42-x_MainMenuHooks
+      - opt-51_cuttime
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Wed, 09 Jul 2008 13:16:05 +0300
+
 vdr (1.6.0-4) unstable; urgency=high
 
   [ Tobias Grimm ]
@@ -238,6 +313,26 @@
 
  -- Thomas Schmidt <tschmidt@debian.org>  Wed, 21 May 2008 22:03:28 +0200
 
+vdr (1.6.0-1ubuntu2) hardy; urgency=low
+
+  * Remove po/vdr.pot after build (FTBFS).
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Wed, 09 Apr 2008 00:58:43 +0300
+
+vdr (1.6.0-1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian experimental (LP: #212216), remaining changes:
+    - Enabled patches:
+      - opt-20_liemikuutio
+      - opt-24_jumpplay
+      - opt-27_ttxtsubs
+      - opt-42-x_MainMenuHooks
+      - opt-51_cuttime
+    - Unexport CXXFLAGS and LDFLAGS to fix FTBFS with the new
+      dpkg-buildpackage.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Sat, 05 Apr 2008 14:08:15 +0300
+
 vdr (1.6.0-1) experimental; urgency=low
 
   [ Tobias Grimm]
diff -u vdr-1.6.0/debian/rules vdr-1.6.0/debian/rules
--- vdr-1.6.0/debian/rules
+++ vdr-1.6.0/debian/rules
@@ -85,6 +85,8 @@
 
 	gcc -o debian/vdr-shutdown.wrapper debian/vdr-shutdown-wrapper.c
 
+	rm -f po/vdr.pot
+
 	touch build-stamp
 
 patchinfo:
diff -u vdr-1.6.0/debian/control vdr-1.6.0/debian/control
--- vdr-1.6.0/debian/control
+++ vdr-1.6.0/debian/control
@@ -1,7 +1,8 @@
 Source: vdr
 Section: video
 Priority: extra
-Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt@debian.org>, Tobias Grimm <etobi@debian.org>, Thomas Günther <tom@toms-cafe.de>
 Build-Depends: debhelper (>= 5), dpatch, libjpeg62-dev, libcap2-dev | libcap-dev,
   libncursesw5-dev, libfreetype6-dev, libfontconfig-dev, gettext,