diff -u perlpanel-0.9.1+cvs20051225/debian/changelog perlpanel-0.9.1+cvs20051225/debian/changelog
--- perlpanel-0.9.1+cvs20051225/debian/changelog
+++ perlpanel-0.9.1+cvs20051225/debian/changelog
@@ -1,3 +1,12 @@
+perlpanel (1:0.9.1+cvs20051225-2ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #235125):
+    - debian/rules: added dh_iconcache
+    - debian/control: Update maintainer fields according to debian-
+      maintainer-field spec.
+
+ -- Nathan Handler <mrcheatr@gmail.com>  Mon, 26 May 2008 21:42:10 -0500
+
 perlpanel (1:0.9.1+cvs20051225-2) unstable; urgency=low
 
   * Makefile: 
@@ -13,6 +22,25 @@
 
  -- Marc 'HE' Brockschmidt <he@debian.org>  Sat, 05 Apr 2008 15:44:03 +0200
 
+perlpanel (1:0.9.1+cvs20051225-1ubuntu3) gutsy; urgency=low
+
+  * debian/control: Update maintainer fields according to debian-
+    maintainer-field spec.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 15 Aug 2007 08:09:32 +0000
+
+perlpanel (1:0.9.1+cvs20051225-1ubuntu2) dapper; urgency=low
+
+  * debian/control: added libgettext-perl to build-deps to avoid FTBFS
+
+ -- Szilveszter Farkas (Phanatic) <Szilveszter.Farkas@gmail.com>  Mon,  8 May 2006 21:11:23 +0200
+
+perlpanel (1:0.9.1+cvs20051225-1ubuntu1) dapper; urgency=low
+
+  * debian/rules: added dh_iconcache
+
+ -- Szilveszter Farkas (Phanatic) <Szilveszter.Farkas@gmail.com>  Mon,  8 May 2006 00:52:32 +0200
+
 perlpanel (1:0.9.1+cvs20051225-1) unstable; urgency=low
 
   * CVS snapshot:
@@ -187,0 +216 @@
+
diff -u perlpanel-0.9.1+cvs20051225/debian/rules perlpanel-0.9.1+cvs20051225/debian/rules
--- perlpanel-0.9.1+cvs20051225/debian/rules
+++ perlpanel-0.9.1+cvs20051225/debian/rules
@@ -38,6 +38,7 @@
 	dh_installexamples
 	dh_installmenu
 	dh_installchangelogs
+	dh_iconcache
 	dh_compress
 	dh_fixperms
 	dh_installdeb
diff -u perlpanel-0.9.1+cvs20051225/debian/control perlpanel-0.9.1+cvs20051225/debian/control
--- perlpanel-0.9.1+cvs20051225/debian/control
+++ perlpanel-0.9.1+cvs20051225/debian/control
@@ -1,7 +1,8 @@
 Source: perlpanel
 Section: x11
 Priority: optional
-Maintainer: Marc 'HE' Brockschmidt <he@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Marc 'HE' Brockschmidt <he@debian.org>
 Build-Depends: debhelper (>= 4), dpatch, gettext, libgtk2-perl, libgtk2-gladexml-perl, libgnome2-wnck-perl, libxml-simple-perl, liblocale-gettext-perl
 Standards-Version: 3.7.3