diff -pruN 1.0.7-4/debian/changelog 1.0.7-4ubuntu1/debian/changelog
--- 1.0.7-4/debian/changelog	2008-07-20 00:15:08.000000000 +0100
+++ 1.0.7-4ubuntu1/debian/changelog	2008-07-20 00:13:28.000000000 +0100
@@ -1,3 +1,13 @@
+kdissert (1.0.7-4ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Change maintainer to MOTU
+    - Add dh_icons to debian/rules
+  * Bump build-dep version for debhelper to 5.0.51 to ensure dh_icons is
+    available
+
+ -- Scott Kitterman <scott@kitterman.com>  Sat, 19 Jul 2008 15:51:38 -0400
+
 kdissert (1.0.7-4) unstable; urgency=low
 
   * Updated dependencies on obsolete packages
@@ -5,6 +15,14 @@ kdissert (1.0.7-4) unstable; urgency=low
 
  -- Peter Eisentraut <petere@debian.org>  Wed, 16 Jul 2008 13:38:58 +0200
 
+kdissert (1.0.7-3ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Change maintainer to MOTU
+    - Add dh_icons (was dh_iconcache before) to debian/rules
+
+ -- Scott Kitterman <scott@kitterman.com>  Mon, 05 May 2008 22:44:08 -0400
+
 kdissert (1.0.7-3) unstable; urgency=low
 
   * Add a couple of missing #includes, fixing compilation with g++ 4.3
@@ -19,6 +37,14 @@ kdissert (1.0.7-2) unstable; urgency=low
 
  -- Peter Eisentraut <petere@debian.org>  Fri, 04 Apr 2008 22:22:53 +0200
 
+kdissert (1.0.7-1ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Change maintainer to MOTU
+    - Add dh_icons (was dh_iconcache before) to debian/rules
+
+ -- Scott Kitterman <scott@kitterman.com>  Fri, 11 Jan 2008 23:25:45 -0500
+
 kdissert (1.0.7-1) unstable; urgency=low
 
   * New upstream release (closes: #447579)
@@ -30,6 +56,14 @@ kdissert (1.0.7-1) unstable; urgency=low
 
  -- Peter Eisentraut <petere@debian.org>  Mon, 07 Jan 2008 16:36:31 +0100
 
+kdissert (1.0.6.c-2ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Retain Ubuntu change - Keep dh_iconcache
+    - Change Maintainer to MOTU and Peter Eisentraut to original maintainer
+
+ -- Scott Kitterman <scott@kitterman.com>  Fri, 23 Feb 2007 17:26:57 -0500
+
 kdissert (1.0.6.c-2) unstable; urgency=low
 
   * Fixed watch file
@@ -38,6 +72,13 @@ kdissert (1.0.6.c-2) unstable; urgency=l
 
  -- Peter Eisentraut <petere@debian.org>  Mon, 12 Feb 2007 15:49:40 +0100
 
+kdissert (1.0.6.c-1.1ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable
+  * Retain Ubuntu change - Keep dh_iconcache
+
+ -- Scott Kitterman <scott@kitterman.com>  Fri, 26 Jan 2007 00:50:41 -0500
+
 kdissert (1.0.6.c-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -47,6 +88,13 @@ kdissert (1.0.6.c-1.1) unstable; urgency
 
  -- Lars Wirzenius <liw@iki.fi>  Thu,  4 Jan 2007 23:35:09 +0200
 
+kdissert (1.0.6.c-1ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable.
+  * Keep dh_iconcache
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Fri, 10 Nov 2006 00:34:20 +1100
+
 kdissert (1.0.6.c-1) unstable; urgency=low
 
   * New upstream release (really called "1.0.6c", but dpkg version ordering
@@ -55,6 +103,12 @@ kdissert (1.0.6.c-1) unstable; urgency=l
 
  -- Peter Eisentraut <petere@debian.org>  Wed, 11 Oct 2006 20:32:39 +0200
 
+kdissert (1.0.6-waf-b-1ubuntu1) edgy; urgency=low
+
+  * Merge from Debian Unstable
+
+ -- Brandon Holtsclaw <imbrandon@kubuntu.org>  Mon, 10 Jul 2006 03:09:51 -0500
+
 kdissert (1.0.6-waf-b-1) unstable; urgency=low
 
   * New upstream release
@@ -119,3 +173,4 @@ kdissert (0.3.5-1) unstable; urgency=low
   * Initial release (closes: #291086)
 
  -- Peter Eisentraut <peter_e@gmx.net>  Mon,  7 Feb 2005 22:08:07 +0100
+
diff -pruN 1.0.7-4/debian/control 1.0.7-4ubuntu1/debian/control
--- 1.0.7-4/debian/control	2008-07-20 00:15:08.000000000 +0100
+++ 1.0.7-4ubuntu1/debian/control	2008-07-20 00:13:28.000000000 +0100
@@ -1,8 +1,9 @@
 Source: kdissert
 Section: kde
 Priority: optional
-Maintainer: Peter Eisentraut <petere@debian.org>
-Build-Depends: cdbs (>= 0.4.37), debhelper (>= 5), imagemagick, kdelibs4-dev (>= 4:3.3), python
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Peter Eisentraut <petere@debian.org>
+Build-Depends: cdbs (>= 0.4.37), debhelper (>= 5.0.51), imagemagick, kdelibs4-dev (>= 4:3.3), python
 Standards-Version: 3.8.0
 Homepage: http://freehackers.org/~tnagy/kdissert.html
 
diff -pruN 1.0.7-4/debian/rules 1.0.7-4ubuntu1/debian/rules
--- 1.0.7-4/debian/rules	2008-07-20 00:15:08.000000000 +0100
+++ 1.0.7-4ubuntu1/debian/rules	2008-07-20 00:13:28.000000000 +0100
@@ -27,7 +27,7 @@ debian/kdissert-16.xpm: src/appdata/hi16
 common-install-arch::
 	$(WAF) install --destdir=$(DEB_DESTDIR)
 	rm -r $(DEB_DESTDIR)/usr/share/applnk
-
+	dh_icons
 
 clean::
 	rm -f build-stamp