diff -u xgalaga-2.1.1.0/debian/rules xgalaga-2.1.1.0/debian/rules
--- xgalaga-2.1.1.0/debian/rules
+++ xgalaga-2.1.1.0/debian/rules
@@ -35,6 +35,8 @@
 	dh_link usr/lib/games/xgalaga/xgal.sndsrv.oss \
 		usr/share/games/xgalaga/xgal.sndsrv.oss
 	dh_install xgalaga-icon.xpm usr/share/pixmaps/
+	dh_install debian/xgalaga.desktop usr/share/applications
+	dh_install debian/xgalaga-hyperspace.desktop usr/share/applications
 	dh_link usr/share/man/man6/xgalaga.6x usr/share/man/man6/xgalaga-hyperspace.6x
 	dh_installdocs README* libsprite/README.libsprite
 	dh_installexamples
diff -u xgalaga-2.1.1.0/debian/changelog xgalaga-2.1.1.0/debian/changelog
--- xgalaga-2.1.1.0/debian/changelog
+++ xgalaga-2.1.1.0/debian/changelog
@@ -1,3 +1,11 @@
+xgalaga (2.1.1.0-1ubuntu1) intrepid; urgency=low
+
+  * Merge from Debian unstable. (LP: #237082) Remaining Ubuntu changes:
+    - Added and installed .desktop files
+    - Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Stefan Ebner <sebner@ubuntu.com>  Mon, 19 May 2008 04:30:13 +0200
+
 xgalaga (2.1.1.0-1) unstable; urgency=low
 
   * New upstream release.
@@ -16,6 +24,14 @@
 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Feb 2008 18:32:42 -0500
 
+xgalaga (2.1.0-1-1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable.  Remaining Ubuntu changes:
+    - Added .desktop files
+    - Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Emmet Hikory <persia@ubuntu.com>  Thu, 14 Feb 2008 01:04:55 +0900
+
 xgalaga (2.1.0-1-1) unstable; urgency=low
 
   * New upstream release!
@@ -33,6 +49,16 @@
 
  -- Joey Hess <joeyh@debian.org>  Fri, 08 Feb 2008 18:47:45 -0500
 
+xgalaga (2.0.34-44ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Added .desktop files, updated deleting encoding field and
+      Application category in Categories, both now deprecated to
+      validate with the latest desktop-file-validate.
+    - Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Andrea Veri <bluekuja@ubuntu.com>  Mon, 09 Jul 2007 11:38:23 +0200
+
 xgalaga (2.0.34-44) unstable; urgency=low
 
   * Update menu file for new policy and de-hardcode paths.
@@ -55,6 +81,13 @@
 
  -- Joey Hess <joeyh@debian.org>  Thu,  8 Feb 2007 18:31:16 -0500
 
+xgalaga (2.0.34-41ubuntu1) feisty; urgency=low
+
+  * Merge from Debian unstable, remaining Ubuntu changes:
+    - debian/rules: install desktop file 
+
+ -- Richard A. Johnson <nixternal@ubuntu.com>  Thu, 23 Nov 2006 11:32:00 -0600
+
 xgalaga (2.0.34-41) unstable; urgency=low
 
   * No change upload to get buildds to rebuild it now that
diff -u xgalaga-2.1.1.0/debian/control xgalaga-2.1.1.0/debian/control
--- xgalaga-2.1.1.0/debian/control
+++ xgalaga-2.1.1.0/debian/control
@@ -2,7 +2,8 @@
 Section: games
 Priority: optional
 Build-Depends: debhelper (>= 5), libx11-dev, libxmu-dev, libxpm-dev, x-dev, dpkg-dev (>= 1.9.0), libxxf86vm-dev, libxxf86dga-dev, autotools-dev
-Maintainer: Joey Hess <joeyh@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Joey Hess <joeyh@debian.org>
 Standards-Version: 3.7.3
 Homepage: http://sourceforge.net/projects/xgalaga/
 Vcs-Git: git://git.kitenet.net/joey/packages/xgalaga
only in patch2:
unchanged:
--- xgalaga-2.1.1.0.orig/debian/xgalaga.desktop
+++ xgalaga-2.1.1.0/debian/xgalaga.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=XGalaga
+Comment=Play Galaga Game
+Exec=xgalaga
+Icon=xgalaga-icon
+Terminal=false
+Type=Application
+Categories=Game;
only in patch2:
unchanged:
--- xgalaga-2.1.1.0.orig/debian/xgalaga-hyperspace.desktop
+++ xgalaga-2.1.1.0/debian/xgalaga-hyperspace.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=XGalaga-Hyperspace
+Comment=Play Galaga Game
+Exec=xgalaga-hyperspace
+Icon=xgalaga-icon
+Terminal=false
+Type=Application
+Categories=Game;