diff -Nru csmash-0.6.6/debian/changelog csmash-0.6.6/debian/changelog
--- csmash-0.6.6/debian/changelog	2010-05-11 20:30:14.000000000 +0200
+++ csmash-0.6.6/debian/changelog	2010-06-21 15:31:01.000000000 +0200
@@ -1,3 +1,10 @@
+csmash (0.6.6-6.5ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable (LP: #596873). Remaining changes:
+    - Add .desktop file
+
+ -- Angel Abad <angelabad@gmail.com>  Mon, 21 Jun 2010 09:29:35 +0100
+
 csmash (0.6.6-6.5) unstable; urgency=low
 
   [ Jari Aalto ]
@@ -35,6 +42,15 @@
 
  -- Jari Aalto <jari.aalto@cante.net>  Tue, 11 May 2010 21:30:14 +0300
 
+csmash (0.6.6-6.4ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes: (LP: #229101)
+   + Add call to dh_desktop to debian/rules.
+   + Add .desktop file.
+   + Change Maintainer/XSBC-Original-Maintainer field.
+
+ -- Emanuele Gentili <emgent@emanuele-gentili.com>  Sat, 10 May 2008 23:56:54 +0200
+
 csmash (0.6.6-6.4) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -48,6 +64,15 @@
 
  -- Kartik Mistry <kartik.mistry@gmail.com>  Sat, 29 Mar 2008 15:35:05 +0530
 
+csmash (0.6.6-6.3ubuntu1) gutsy; urgency=low
+
+  * Add call to dh_desktop to debian/rules.
+  * Add .desktop file (Closes LP: #126903).
+  * Fix watch file.
+  * Change Maintainer/XSBC-Original-Maintainer field.
+
+ -- William Lima <wlima.amadeus@gmail.com>  Thu, 26 Jul 2007 16:35:43 -0300
+
 csmash (0.6.6-6.3) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -256,3 +281,4 @@
   * Initial release (closes: #96871)
 
  -- Wolfgang Sourdeau <was@debian.org>  Fri, 11 May 2001 01:22:34 -0400
+
diff -Nru csmash-0.6.6/debian/control csmash-0.6.6/debian/control
--- csmash-0.6.6/debian/control	2010-05-09 20:22:11.000000000 +0200
+++ csmash-0.6.6/debian/control	2010-06-21 15:21:56.000000000 +0200
@@ -1,7 +1,8 @@
 Source: csmash
 Section: games
 Priority: optional
-Maintainer: Bartosz Fenski <fenio@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Bartosz Fenski <fenio@debian.org>
 Build-Depends: debhelper (>= 7.1), xutils-dev, libjpeg62-dev | libjpeg-dev, zlib1g-dev | libz-dev, libgl1-mesa-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libsdl-image1.2-dev, libgtk2.0-dev, libogg-dev, libvorbis-dev, autotools-dev, libxt-dev
 Build-Conflicts: nvidia-glx
 Standards-Version: 3.8.4
diff -Nru csmash-0.6.6/debian/csmash.desktop csmash-0.6.6/debian/csmash.desktop
--- csmash-0.6.6/debian/csmash.desktop	1970-01-01 01:00:00.000000000 +0100
+++ csmash-0.6.6/debian/csmash.desktop	2010-06-21 10:29:17.000000000 +0200
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Cannon Smash
+Comment=3D tabletennis game
+Exec=csmash
+Terminal=false
+Type=Application
+Categories=Game;
+StartupNotify=false
diff -Nru csmash-0.6.6/debian/csmash.dirs csmash-0.6.6/debian/csmash.dirs
--- csmash-0.6.6/debian/csmash.dirs	2010-05-02 19:28:21.000000000 +0200
+++ csmash-0.6.6/debian/csmash.dirs	2010-06-21 10:29:34.000000000 +0200
@@ -1,2 +1,3 @@
 usr/share/pixmaps
 usr/share/games
+usr/share/applications
diff -Nru csmash-0.6.6/debian/rules csmash-0.6.6/debian/rules
--- csmash-0.6.6/debian/rules	2010-05-11 20:29:58.000000000 +0200
+++ csmash-0.6.6/debian/rules	2010-06-21 15:23:54.000000000 +0200
@@ -62,6 +62,8 @@
 		localedir=$(DEBIAN_DIR)/$(package)/usr/share/locale
 	install -D -m 644 debian/csmash.xpm \
 		$(DEBIAN_DIR)/$(package)/usr/share/pixmaps/csmash.xpm
+	install -D -m 644 debian/csmash.desktop \
+		$(DEBIAN_DIR)/$(package)/usr/share/applications
 	# Delete empty dir
 	rmdir $(DEBIAN_DIR)/$(package)/usr/share/games
 	touch install-stamp