diff -u kiki-0.5.6/debian/control kiki-0.5.6/debian/control
--- kiki-0.5.6/debian/control
+++ kiki-0.5.6/debian/control
@@ -1,11 +1,13 @@
 Source: kiki
 Section: python
 Priority: optional
-Maintainer: Franz Pletz <fpletz@franz-pletz.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Franz Pletz <fpletz@franz-pletz.org>
 Build-Depends: debhelper (>= 5.0.37.2), python-central (>= 0.5)
 Build-Depends-Indep: python-all-dev, docbook-to-man
 XS-Python-Version: all
 Standards-Version: 3.7.2
+Homepage: http://project5.freezope.org/kiki
 
 Package: kiki
 Architecture: all
diff -u kiki-0.5.6/debian/rules kiki-0.5.6/debian/rules
--- kiki-0.5.6/debian/rules
+++ kiki-0.5.6/debian/rules
@@ -41,6 +41,7 @@
 	dh_installdocs readme.txt docs/*
 	dh_installmenu
 	dh_installman debian/kiki.1
+	dh_install
 	dh_link
 	dh_compress
 	dh_fixperms
diff -u kiki-0.5.6/debian/changelog kiki-0.5.6/debian/changelog
--- kiki-0.5.6/debian/changelog
+++ kiki-0.5.6/debian/changelog
@@ -1,9 +1,43 @@
+kiki (0.5.6-3.1ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes: (LP: #302016)
+    - Created debian/kiki.desktop (LP: #154303)
+    - Created debian/kiki.install.
+    - Added dh_install to debian/rules.
+    - Added Hompage field to debian/control.
+
+ -- Stefan Lesicnik <stefan@lsd.co.za>  Tue, 25 Nov 2008 14:48:07 +0200
+
 kiki (0.5.6-3.1) unstable; urgency=low
 
   * NMU. Rebuild to move files to /usr/share/pyshared. Closes: #490475.
 
  -- Matthias Klose <doko@debian.org>  Fri, 18 Jul 2008 15:55:25 +0000
 
+kiki (0.5.6-3ubuntu3) intrepid; urgency=low
+
+  * Removed Utility from debian/desktop (LP: #260705)
+
+ -- Stefan Lesicnik <stefan@lsd.co.za>  Sat, 23 Aug 2008 20:48:39 +0200
+
+kiki (0.5.6-3ubuntu2) intrepid; urgency=low
+
+  * Changed build1 to ubuntu2 in changelog.
+  * Created debian/kiki.desktop (LP: #154303).
+  * Created debian/kiki.install.
+  * Added dh_install to debian/rules.
+  * Updated Maintainer.
+  * Bumped Standards-Version.
+  * Added Hompage field to debian/control.
+
+ -- Stefan Lesicnik <stefan@lsd.co.za>  Tue, 19 Aug 2008 17:32:06 +0200
+
+kiki (0.5.6-3build1) edgy; urgency=low
+
+  * Fake sync with Debian (different orig.tar.gz)
+
+ -- Barry deFreese <bddebian@comcast.net>  Tue, 25 Jul 2006 11:30:43 -0400
+
 kiki (0.5.6-3) unstable; urgency=low
 
   * New maintainer. (Approved by Matthias)
only in patch2:
unchanged:
--- kiki-0.5.6.orig/debian/kiki.install
+++ kiki-0.5.6/debian/kiki.install
@@ -0,0 +1 @@
+debian/*.desktop            usr/share/applications
only in patch2:
unchanged:
--- kiki-0.5.6.orig/debian/kiki.desktop
+++ kiki-0.5.6/debian/kiki.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Kiki
+Comment=Regular expression testing
+Exec=kiki
+Icon=kiki
+Terminal=false
+Type=Application
+Categories=Development;