diff -u genesis-2.2.1/debian/changelog genesis-2.2.1/debian/changelog
--- genesis-2.2.1/debian/changelog
+++ genesis-2.2.1/debian/changelog
@@ -1,3 +1,10 @@
+genesis (2.2.1-7ubuntu1) edgy; urgency=low
+
+  * Re-sync with Debian
+  * Re-add desktop file from Phil Bull (Closes Malone: #36379)
+
+ -- Barry deFreese <bddebian@comcast.net>  Sat,  8 Jul 2006 20:04:39 -0400
+
 genesis (2.2.1-7) unstable; urgency=low
 
   * debian/control:
diff -u genesis-2.2.1/debian/rules genesis-2.2.1/debian/rules
--- genesis-2.2.1/debian/rules
+++ genesis-2.2.1/debian/rules
@@ -85,6 +85,8 @@
 	dh_installmenu -a
 	dh_installman -a debian/genesis.1 man/man1/genesis-convert.1
 	dh_installchangelogs -a src/CHANGES
+	dh_install debian/genesis.desktop usr/share/applications
+	dh_desktop
 	dh_link -a
 	dh_strip -a
 	dh_compress -a
only in patch2:
unchanged:
--- genesis-2.2.1.orig/debian/genesis.desktop
+++ genesis-2.2.1/debian/genesis.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=GENESIS Neural Simulator
+GenericName=Neural Simulator
+Comment=Simulate different types of neural systems
+Type=Application
+Exec=genesis
+Icon=genesis
+Categories=Application;Science;Biology;Education;