diff -u tvtime-1.0.2/debian/control tvtime-1.0.2/debian/control
--- tvtime-1.0.2/debian/control
+++ tvtime-1.0.2/debian/control
@@ -1,7 +1,8 @@
 Source: tvtime
 Section: x11
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
 Build-Depends: debhelper (>= 7), zlib1g-dev, libpng-dev, libfreetype6-dev, libx11-dev, libxext-dev, libxinerama-dev,
  libxt-dev, libxtst-dev, libxv-dev, libxxf86vm-dev, libxml2-dev, fontforge
 Standards-Version: 3.6.2
diff -u tvtime-1.0.2/debian/rules tvtime-1.0.2/debian/rules
--- tvtime-1.0.2/debian/rules
+++ tvtime-1.0.2/debian/rules
@@ -90,6 +90,7 @@
 	cp -f $(CURDIR)/docs/html/*.css $(CURDIR)/debian/tvtime/usr/share/doc/tvtime/html/
 
 
+
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.
@@ -105,6 +106,7 @@
 	dh_installman
 	dh_lintian
 	dh_installchangelogs ChangeLog
+	dh_icons
 	dh_link
 	dh_strip
 	dh_compress -Xdefault.tvtime.xml -Xexample.lirc
diff -u tvtime-1.0.2/debian/changelog tvtime-1.0.2/debian/changelog
--- tvtime-1.0.2/debian/changelog
+++ tvtime-1.0.2/debian/changelog
@@ -1,3 +1,10 @@
+tvtime (1.0.2-1ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable (LP: #297120), remaining changes:
+    - debian/rules: call dh_icons.
+
+ -- Iulian Udrea <iulian@ubuntu.com>  Wed, 12 Nov 2008 09:41:12 +0000
+
 tvtime (1.0.2-1) unstable; urgency=low
 
   * QA upload.
@@ -17,6 +24,23 @@
 
  -- Frank Lichtenheld <djpig@debian.org>  Fri, 25 Jul 2008 01:42:06 +0200
 
+tvtime (1.0.2-0.3ubuntu2) hardy; urgency=low
+
+  * debian/rules:
+    + Replace dh_iconcache with dh_icons.
+  * debian/control:
+    + Build-depend on debhelper >= 5.0.51 (for dh_icons).
+
+ -- Michael Bienia <geser@ubuntu.com>  Sat, 01 Mar 2008 20:55:29 +0100
+
+tvtime (1.0.2-0.3ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+     - debian/rules: call dh_iconcache
+     - Set Maintainer to Ubuntu MOTU Developers
+
+ -- Adrien Cunin <adri2000@ubuntu.com>  Sat, 30 Jun 2007 01:50:12 +0200
+
 tvtime (1.0.2-0.3) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -25,6 +49,15 @@
 
  -- Andreas Barth <aba@not.so.argh.org>  Thu, 28 Jun 2007 16:46:27 +0000
 
+tvtime (1.0.2-0.2ubuntu1) feisty; urgency=low
+
+  * Merge from Debian unstable. Ubuntu changes:
+     - src/videodev2.h: no need to include <linux/compiler.h>
+     - debian/rules: call dh_iconcache
+  * Set Maintainer to Ubuntu MOTU Developers
+
+ -- Adrien Cunin <adri2000@gmail.com>  Tue, 27 Feb 2007 00:28:04 +0100
+
 tvtime (1.0.2-0.2) unstable; urgency=low
 
   * Non-maintainer upload to fix pending l10n issues.
@@ -38,6 +71,14 @@
 
  -- Christian Perrier <bubulle@debian.org>  Sat, 24 Feb 2007 19:21:03 +0100
 
+tvtime (1.0.2-0.1ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable. Remaining changes:
+    - src/videodev2.h: no need to include <linux/compiler.h>.
+    - call dh_iconcache in debian/rules.
+
+ -- Jeremie Corbier <jcorbier@ubuntu.com>  Sun, 19 Nov 2006 19:34:28 -0800
+
 tvtime (1.0.2-0.1) unstable; urgency=medium
 
   * NMU with maintainer approval.
@@ -54,6 +95,14 @@
 
  -- Thijs Kinkhorst <thijs@debian.org>  Sun,  1 Oct 2006 17:43:14 +0200
 
+tvtime (1.0.1-2.2ubuntu1) edgy; urgency=low
+
+  * Merge from debian unstable.
+  * src/videodev2.h: remove useless #include <linux/compiler.h> which caused a
+    FTBFS.
+
+ -- Jeremie Corbier <jcorbier@ubuntu.com>  Sun, 13 Aug 2006 00:21:33 +0200
+
 tvtime (1.0.1-2.2) unstable; urgency=low
 
   * NMU as part of the GCC 4.1 transition.
@@ -69,6 +118,20 @@
 
  -- Steinar H. Gunderson <sesse@debian.org>  Sat, 21 Jan 2006 14:40:47 +0100
 
+tvtime (1.0.1-2ubuntu2) dapper; urgency=low
+
+  * debian/rules
+   + Added dh_iconcache
+
+ -- Chuck Short <zulcss@gmail.com>  Sun, 30 Apr 2006 09:17:00 -0400
+
+tvtime (1.0.1-2ubuntu1) breezy; urgency=low
+
+  * add build depends on libxxf86vm-dev and libxinerama-dev to fix multihead
+    setups
+
+ -- Reinhard Tartler <siretart@tauware.de>  Fri, 23 Sep 2005 22:54:26 +0200
+
 tvtime (1.0.1-2) unstable; urgency=low
 
   * Switch architecture to any, since tvtime no longer depends on i386