diff -urN old/debian/changelog new/debian/changelog
--- old/debian/changelog	2007-11-17 18:39:32.000000000 +0100
+++ new/debian/changelog	2007-11-17 18:39:15.000000000 +0100
@@ -1,3 +1,19 @@
+ksimus (0.3.6-2-13ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Modified .desktop as indicated by Phil Bull
+    - Fix up ksimus.desktop file.
+      + Move to /usr/share/applications.
+    - Enabled dh_installmenu and dh_desktop
+    - Added dh_iconcache.
+    (Closes LP: #161837)
+  * In debian/control:
+    - Set Maintainer field to Ubuntu MOTU Developers.
+  * In debian/rules:
+    - Replaced dh_iconcache with dh_icons.
+
+ -- Sasa Bodiroza <jazzva@gmail.com>  Mon, 22 Oct 2007 11:27:23 +0100
+
 ksimus (0.3.6-2-13) unstable; urgency=low
 
   * QA upload.
@@ -7,6 +23,22 @@
 
  -- Raphael Geissert <atomo64@gmail.com>  Sun, 21 Oct 2007 18:05:45 -0500
 
+ksimus (0.3.6-2-12ubuntu2) feisty; urgency=low
+
+  * Modified .desktop as indicated by Phil Bull
+  * Enabled dh_installmenu and dh_desktop
+
+ -- Emmet Hikory <emmet.hikory@gmail.com>  Tue,  9 Jan 2007 00:17:26 +0900
+
+ksimus (0.3.6-2-12ubuntu1) feisty; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - Fix up ksimus.desktop file.
+      + Move to /usr/share/applications.
+    - Added dh_iconcache.
+
+ -- William Alexander Grant <william.grant@ubuntu.com.au>  Thu,  7 Dec 2006 21:10:01 +1100
+
 ksimus (0.3.6-2-12) unstable; urgency=low
 
   * Orphaning this package, setting maintainer field to
@@ -14,6 +46,12 @@
 
  -- Aurelien Jarno <aurel32@debian.org>  Sun, 15 Oct 2006 16:15:52 +0200
 
+ksimus (0.3.6-2-11ubuntu1) edgy; urgency=low
+
+  * Re-merge with Debian
+
+ -- Barry deFreese <bddebian@comcast.net>  Wed, 26 Jul 2006 22:18:57 -0400
+
 ksimus (0.3.6-2-11) unstable; urgency=low
 
   * Fixed a silly test of the autoconf version in the KDE scripts.
@@ -21,6 +59,19 @@
 
  -- Aurelien Jarno <aurel32@debian.org>  Thu, 20 Jul 2006 23:22:14 +0200
 
+ksimus (0.3.6-2-10ubuntu2) dapper; urgency=low
+
+  * Fix up ksimus.desktop file
+  * Move to /usr/share/applications
+
+ -- Barry deFreese <bddebian@comcast.net>  Fri, 26 May 2006 11:48:04 -0400
+
+ksimus (0.3.6-2-10ubuntu1) dapper; urgency=low
+
+  * Added dh_iconcache
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Wed, 10 May 2006 21:33:42 +1000
+
 ksimus (0.3.6-2-10) unstable; urgency=low
 
   * Added Spanish translation. Thanks to Juan Manuel Garcia Molina
@@ -284,3 +335,4 @@
 Local variables:
 mode: debian-changelog
 End:
+
diff -urN old/debian/control new/debian/control
--- old/debian/control	2007-11-17 18:39:32.000000000 +0100
+++ new/debian/control	2007-11-17 18:39:15.000000000 +0100
@@ -1,7 +1,8 @@
 Source: ksimus
 Section: electronics
 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 (>> 4.0.0), autotools-dev, autoconf, libtool, automake1.7, libqt3-mt-dev (>= 3:3.3.4-7), libqt3-compat-headers, kdelibs4-dev (>= 4:3.4.2-1), libltdl3-dev, imagemagick, quilt (>= 0.4)
 Standards-Version: 3.7.2
 
diff -urN old/debian/rules new/debian/rules
--- old/debian/rules	2007-11-17 18:39:32.000000000 +0100
+++ new/debian/rules	2007-11-17 18:39:15.000000000 +0100
@@ -88,6 +88,10 @@
 	# Install icon
 	convert $(CURDIR)/ksimus/hi32-app-ksimus.png $(CURDIR)/debian/ksimus/usr/share/pixmaps/ksimus.xpm
 
+	# Move desktop file
+	install -d $(CURDIR)/debian/ksimus/usr/share/applications
+	mv $(CURDIR)/debian/ksimus/usr/share/applnk/Applications/ksimus.desktop \
+		$(CURDIR)/debian/ksimus/usr/share/applications
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -96,7 +100,9 @@
 #	dh_installdebconf	
 	dh_installdocs -i
 #	dh_installexamples
-#	dh_installmenu
+	dh_installmenu
+	dh_desktop
+	dh_icons
 #	dh_installlogrotate
 #	dh_installemacsen
 #	dh_installpam
diff -urN old/ksimus/ksimus.desktop new/ksimus/ksimus.desktop
--- old/ksimus/ksimus.desktop	2007-11-17 18:39:32.000000000 +0100
+++ new/ksimus/ksimus.desktop	2007-11-17 18:39:15.000000000 +0100
@@ -1,17 +1,18 @@
 # KDE Config File  
-[KDE Desktop Entry]
+[Desktop Entry]
+Encoding=UTF-8
 Version=1.0
 Type=Application
 TryExec=ksimus
 Exec=ksimus -caption "%c" %i %m %u
-Icon=ksimus.png
-MiniIcon=ksimus.png
-DocPath=ksimus/index.html
-Comment=KSimus is a tool for simulation, automatization and visualization of technical processes.
-Terminal=0
-Name=KSimus
+Icon=ksimus
+X-DocPath=ksimus/index.html
+Comment=Simulate and visualize digital electronic circuits
+Terminal=false
+Name=KSimus Circuit Simulator
 MimeType=application/x-ksimus
-InitialPreference=100
+X-InitialPreference=100
+Categories=Electronics;Education;KDE;Science;