diff -u enigma-1.01/debian/rules enigma-1.01/debian/rules
--- enigma-1.01/debian/rules
+++ enigma-1.01/debian/rules
@@ -10,6 +10,9 @@
   DEB_OPT_FLAG += -O2 -mieee
 endif
 
+binary-post-install/enigma-data::
+	dh_icons -penigma-data
+
 DEB_CONFIGURE_EXTRA_FLAGS := --datadir=\$${prefix}/share/games --bindir=\$${prefix}/games --enable-optimize
 
 binary-post-install/enigma-data::
diff -u enigma-1.01/debian/changelog enigma-1.01/debian/changelog
--- enigma-1.01/debian/changelog
+++ enigma-1.01/debian/changelog
@@ -1,3 +1,10 @@
+enigma (1.01-5ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #398442
+    - Added dh_iconcache (now replaced with dh_icons)
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Sun, 12 Jul 2009 19:52:17 +0530
+
 enigma (1.01-5) unstable; urgency=medium
 
   * Use upstream patches r1745 and r1541, which do the same fix for
@@ -31,6 +38,13 @@
 
  -- Erich Schubert <erich@debian.org>  Tue, 07 Jul 2009 21:04:22 +0200
 
+enigma (1.01-3ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Added dh_iconcache (now replaced with dh_icons)
+
+ -- Stephan Hermann <sh@sourcecode.de>  Mon, 05 May 2008 17:02:46 +0200
+
 enigma (1.01-3) unstable; urgency=low
 
   * Minor changes in preparation for the 'lenny' release.
@@ -54,6 +68,13 @@
   
  -- Kumar Appaiah <akumar@ee.iitm.ac.in>  Sun, 23 Mar 2008 11:59:23 +0530
 
+enigma (1.01-2ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Added dh_iconcache (now replaced with dh_icons)
+
+ -- Stephan Hermann <sh@sourcecode.de>  Thu, 17 Jan 2008 20:46:26 +0100
+
 enigma (1.01-2) unstable; urgency=low
 
   * Add Homepage field
@@ -70,6 +91,14 @@
 
  -- Erich Schubert <erich@debian.org>  Sat, 05 Jan 2008 19:40:48 +0100
 
+enigma (1.01-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Added dh_iconcache
+    - Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Albin Tonnerre <lut1n.tne@gmail.com>  Sat,  2 Jun 2007 21:31:06 +0200
+
 enigma (1.01-1) unstable; urgency=low
 
   * New upstream version 1.01 (Closes: #426321)
@@ -87,6 +116,14 @@
 
  -- Erich Schubert <erich@debian.org>  Fri, 01 Jun 2007 17:32:47 +0200
 
+enigma (1.00-2ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Added dh_iconcache
+  * Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Albin Tonnerre <lut1n.tne@gmail.com>  Wed,  2 May 2007 00:25:22 +0200
+
 enigma (1.00-2) unstable; urgency=low
 
   * No changes that should affect users of this package.
@@ -96,6 +133,13 @@
 
  -- Erich Schubert <erich@debian.org>  Fri, 16 Mar 2007 02:31:17 +0100
 
+enigma (1.00-1ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Added dh_iconcache
+
+ -- Albin Tonnerre <lut1n.tne@gmail.com>  Thu, 14 Dec 2006 23:31:14 +0000
+
 enigma (1.00-1) unstable; urgency=low
 
   * New upstream version: 1.00 final. Too bad we just missed the etch freeze.
@@ -117,6 +161,13 @@
 
  -- Erich Schubert <erich@debian.org>  Sun,  3 Dec 2006 22:39:31 +0100
 
+enigma (1.00~beta-r473-2ubuntu1) feisty; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Added dh_iconcache.
+
+ -- William Alexander Grant <william.grant@ubuntu.com.au>  Thu,  7 Dec 2006 21:57:48 +1100
+
 enigma (1.00~beta-r473-2) unstable; urgency=low
 
   * Fix grammar in description (Closes: #400492))
@@ -172,6 +223,28 @@
 
  -- Erich Schubert <erich@debian.org>  Wed,  9 Aug 2006 21:41:10 +0200
 
+enigma (0.92.3-3ubuntu1) edgy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Added dh_iconcache.
+
+ -- William Alexander Grant <william.grant@ubuntu.com.au>  Sun, 17 Sep 2006 08:49:31 +1000
+
+enigma (0.92.3-3) unstable; urgency=low
+
+  * Use automake1.9 and add mkinstalldirs patch to avoid issues with new
+    gettext in sid (Closes: #386259)
+  * Fix not-binNMUable warning by lintian (thanks guys!)
+  * Update policy, no changes.
+
+ -- Erich Schubert <erich@debian.org>  Fri,  8 Sep 2006 01:32:04 +0200
+
+enigma (0.92.3-2ubuntu1) edgy; urgency=low
+
+  * Merge from debian unstable.
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Mon, 10 Jul 2006 16:04:47 +1000
+
 enigma (0.92.3-2) unstable; urgency=low
 
   * Grab "rotator laser handling" bugfix from SVN (r84)
@@ -194,6 +267,13 @@
 
  -- Erich Schubert <erich@debian.org>  Tue, 24 Jan 2006 14:34:22 +0100
 
+enigma (0.92.2-1ubuntu1) dapper; urgency=low
+
+  * debian/rules:
+    + Use dh_iconcache .
+
+ -- Zak B. Elep <zakame@ubuntu.com>  Sun, 16 Apr 2006 05:22:56 -0400
+
 enigma (0.92.2-1) unstable; urgency=low
 
   * New upstream subversion checkout
diff -u enigma-1.01/debian/control enigma-1.01/debian/control
--- enigma-1.01/debian/control
+++ enigma-1.01/debian/control
@@ -1,7 +1,8 @@
 Source: enigma
 Section: games
 Priority: extra
-Maintainer: Erich Schubert <erich@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Erich Schubert <erich@debian.org>
 Build-Depends: debhelper (>= 6), cdbs, bzip2, autoconf, automake1.9, texinfo, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl1.2-dev, libzipios++-dev, libsdl-gfx1.2-dev, texi2html, libsdl-ttf2.0-dev, libxerces-c-dev
 Standards-Version: 3.8.2.0