diff -u maelstrom-1.4.3-L3.0.6/debian/changelog maelstrom-1.4.3-L3.0.6/debian/changelog
--- maelstrom-1.4.3-L3.0.6/debian/changelog
+++ maelstrom-1.4.3-L3.0.6/debian/changelog
@@ -1,3 +1,12 @@
+maelstrom (1.4.3-L3.0.6-8ubuntu1) natty; urgency=low
+
+  * Merge from debian testing (LP: #669904).  Remaining changes:
+    - Re-added desktop file, updated to validate with latest desktop-file-validate
+      and install icon in /usr/share/pixmaps
+    - debian/rules: bashism for cp'ing /usr/share/misc/config.{guess,sub}
+
+ -- Angel Abad <angelabad@ubuntu.com>  Tue, 02 Nov 2010 14:18:22 +0100
+
 maelstrom (1.4.3-L3.0.6-8) unstable; urgency=low
 
   * fixed some compiler warnings with gcc-4.3.2
@@ -5,11 +14,29 @@
 
  -- Christoph Baumann <cgb@debian.org>  Fri, 1 Jan 2010 23:10:42 +0100
 
+maelstrom (1.4.3-L3.0.6-7ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Re-added desktop file, updated to validate with latest desktop-file-validate
+      and install icon in /usr/share/pixmaps
+    - debian/rules: bashism for cp'ing /usr/share/misc/config.{guess,sub}
+  * Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Andrea Veri <bluekuja@ubuntu.com>  Tue, 03 Jul 2007 23:33:08 +0200
+
 maelstrom (1.4.3-L3.0.6-7) unstable; urgency=low
 
   * added handling for SIGINT (Closes: #431234)
 
  -- Christoph Baumann <cgb@debian.org>  Tue, 3 Jul 2007 20:46:42 +0100
+
+maelstrom (1.4.3-L3.0.6-6.1ubuntu1) edgy; urgency=low
+
+  * Re-sync with Debian
+  * Re-add desktop file and install icon in /usr/share/pixmaps
+  * debian/rules: bashism for cp'ing /usr/share/misc/config.{guess,sub}
+
+ -- Barry deFreese <bddebian@comcast.net>  Sat, 22 Jul 2006 14:07:13 -0400
   
 maelstrom (1.4.3-L3.0.6-6.1) unstable; urgency=low
 
diff -u maelstrom-1.4.3-L3.0.6/debian/control maelstrom-1.4.3-L3.0.6/debian/control
--- maelstrom-1.4.3-L3.0.6/debian/control
+++ maelstrom-1.4.3-L3.0.6/debian/control
@@ -1,7 +1,8 @@
 Source: maelstrom
 Section: non-free/games
 Priority: optional
-Maintainer: Christoph Baumann <cgb@debian.org> 
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Christoph Baumann <cgb@debian.org> 
 Standards-Version: 3.8.3
 Build-Depends: libsdl1.2-dev, libsdl-net1.2-dev, debhelper (>= 7), autotools-dev, build-essential
 
diff -u maelstrom-1.4.3-L3.0.6/debian/rules maelstrom-1.4.3-L3.0.6/debian/rules
--- maelstrom-1.4.3-L3.0.6/debian/rules
+++ maelstrom-1.4.3-L3.0.6/debian/rules
@@ -13,7 +13,8 @@
 build:
 	$(checkdir)
 	set -e;
-	cp /usr/share/misc/config.{guess,sub} .
+	cp /usr/share/misc/config.guess .
+	cp /usr/share/misc/config.sub .
 	cp debian/configure.debian.compile ./configure
 	./configure
 	make
@@ -52,11 +53,15 @@
 	chown root.games ${BINDIR}/Maelstrom
 	chmod 2755 ${BINDIR}/Maelstrom
 	install -d ${LIBDIR}
+	install -d debian/tmp/usr/share/applications
+	install -d debian/tmp/usr/share/pixmaps
 #move lib files
 	cp -rv ${BINDIR}/Images ${LIBDIR}
 	rm -rf ${BINDIR}/Images
 	cp ${BINDIR}/icon.* ${LIBDIR}
+	cp ${BINDIR}/icon.xpm debian/tmp/usr/share/pixmaps/maelstrom.xpm
 	rm -f ${BINDIR}/icon.*
+	cp debian/maelstrom.desktop debian/tmp/usr/share/applications
 	cp ${BINDIR}/Maelstrom_* ${LIBDIR}
 	rm -f  ${BINDIR}/Maelstrom_*
 	chmod +x debian/handle_underscores
only in patch2:
unchanged:
--- maelstrom-1.4.3-L3.0.6.orig/debian/maelstrom.desktop
+++ maelstrom-1.4.3-L3.0.6/debian/maelstrom.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Maelstrom
+GenericName=Ambrosia Maelstrom
+Comment=Play an Asteroids like game
+Icon=maelstrom.xpm
+Exec=/usr/games/maelstrom
+Terminal=false
+Categories=Application;Game;ArcadeGame