diff -u starfighter-1.1/debian/rules starfighter-1.1/debian/rules
--- starfighter-1.1/debian/rules
+++ starfighter-1.1/debian/rules
@@ -52,6 +52,9 @@
 	dh_testroot -i
 	dh_installchangelogs -i
 	dh_installdocs -i debian/pack.py debian/unpack.py
+	dh_desktop
+	dh_link -i
+	dh_strip -i
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
diff -u starfighter-1.1/debian/changelog starfighter-1.1/debian/changelog
--- starfighter-1.1/debian/changelog
+++ starfighter-1.1/debian/changelog
@@ -1,3 +1,12 @@
+starfighter (1.1-7ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Added a .desktop file
+    - debian/rules: Added calls to dh_desktop, dh_strip, and dh_link
+    - debian/starfighter.install: Install .desktop file
+
+ -- Cody A.W. Somerville <cody-somerville@ubuntu.com>  Fri, 14 Mar 2008 13:18:38 -0300
+
 starfighter (1.1-7) unstable; urgency=low
 
   [ Eddy Petrișor ]
@@ -25,6 +34,12 @@
 
  -- Gonéri Le Bouder <goneri@rulezlan.org>  Sat, 22 Sep 2007 10:27:49 +0000
 
+starfighter (1.1-6ubuntu1) feisty; urgency=low
+
+  * Added a .desktop file (closes Ubuntu: #60292)
+
+ -- Emmet Hikory <emmet.hikory@gmail.com>  Wed, 17 Jan 2007 22:46:05 +0900
+
 starfighter (1.1-6) unstable; urgency=low
 
   * debian/patches/01_makefile.diff:
diff -u starfighter-1.1/debian/starfighter.dirs starfighter-1.1/debian/starfighter.dirs
--- starfighter-1.1/debian/starfighter.dirs
+++ starfighter-1.1/debian/starfighter.dirs
@@ -2,0 +3 @@
+usr/share/applications
diff -u starfighter-1.1/debian/starfighter.install starfighter-1.1/debian/starfighter.install
--- starfighter-1.1/debian/starfighter.install
+++ starfighter-1.1/debian/starfighter.install
@@ -3 +3 @@
-
+debian/starfighter.desktop usr/share/applications
only in patch2:
unchanged:
--- starfighter-1.1.orig/debian/starfighter.desktop
+++ starfighter-1.1/debian/starfighter.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Starfighter
+Comment=Play a 2D scrolling shooter game
+Exec=starfighter
+Icon=starfighter
+Terminal=false
+Type=Application
+Categories=Game;ArcadeGame;
+StartupNotify=false