diff -u tuxtype-1.5.17.dfsg1/debian/tuxtype.desktop tuxtype-1.5.17.dfsg1/debian/tuxtype.desktop
--- tuxtype-1.5.17.dfsg1/debian/tuxtype.desktop
+++ tuxtype-1.5.17.dfsg1/debian/tuxtype.desktop
@@ -1,8 +1,10 @@
 [Desktop Entry]
-Name=TuxType
+Name=Tux Typing
+Name[fr]=Tux Typing
 Comment=Type Trainer Game
+Comment[fr]=Apprenez à taper au clavier en vous amusant
 Exec=tuxtype
-Icon=/usr/share/tuxtype/tuxtype.xpm
+Icon=tuxtype
 Terminal=false
 Type=Application
 Categories=Game;KidsGame;
diff -u tuxtype-1.5.17.dfsg1/debian/changelog tuxtype-1.5.17.dfsg1/debian/changelog
--- tuxtype-1.5.17.dfsg1/debian/changelog
+++ tuxtype-1.5.17.dfsg1/debian/changelog
@@ -1,3 +1,23 @@
+tuxtype (1.5.17.dfsg1-3ubuntu2) jaunty; urgency=low
+
+  * [debian/rules]:
+    - install .desktop file (LP# 293397);
+    - fix directory for icon, install in /usr/share/pixmaps instead of
+      /usr/share/tuxtype;
+    - remove a few empty spaces at end of line.
+  * [debian/tuxtype.dirs]: replace usr/share/tuxtype by usr/share/pixmaps, add
+      /usr/share/applications (necessary for building the package during target
+      "install:" in debian/rules - packaging was done like that).
+  * [debian/tuxtype.desktop]:
+    - fix displayed name, which upstream refers as Tux Typing;
+    - fix syntax for icon (directory, name without extension);
+    - add French translation while we're at it.
+  * [debian/menu]:
+    - change path for icon;
+    - change displayed name to Tux Typing (see above).
+
+ -- Loïc Martin <loic.martin3@gmail.com>  Sat, 31 Jan 2009 21:15:29 +0100
+
 tuxtype (1.5.17.dfsg1-3ubuntu1) intrepid; urgency=low
 
   * Merge from debian unstable. (LP: #261991) remaining changes:
diff -u tuxtype-1.5.17.dfsg1/debian/menu tuxtype-1.5.17.dfsg1/debian/menu
--- tuxtype-1.5.17.dfsg1/debian/menu
+++ tuxtype-1.5.17.dfsg1/debian/menu
@@ -2,2 +2,2 @@
-  icon="/usr/share/tuxtype/tuxtype.xpm" \
-  title="Tuxtype" command="/usr/games/tuxtype"
+  icon="/usr/share/pixmaps/tuxtype.xpm" \
+  title="Tux Typing" command="/usr/games/tuxtype"
diff -u tuxtype-1.5.17.dfsg1/debian/tuxtype.dirs tuxtype-1.5.17.dfsg1/debian/tuxtype.dirs
--- tuxtype-1.5.17.dfsg1/debian/tuxtype.dirs
+++ tuxtype-1.5.17.dfsg1/debian/tuxtype.dirs
@@ -2 +2,2 @@
-usr/share/tuxtype
+usr/share/pixmaps
+/usr/share/applications
diff -u tuxtype-1.5.17.dfsg1/debian/rules tuxtype-1.5.17.dfsg1/debian/rules
--- tuxtype-1.5.17.dfsg1/debian/rules
+++ tuxtype-1.5.17.dfsg1/debian/rules
@@ -23,7 +23,7 @@
 	CFLAGS += -O2
 endif
 
-config.status: 
+config.status:
 	dh_testdir
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	# because we patch a Makefile.am to fix nynorsk in 1.5.17
@@ -53,21 +53,22 @@
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 	rm -f build-arch-stamp build-indep-stamp install-stamp
 	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean 
+	dh_clean
 
 
 install:
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
-	dh_installdirs 
+	dh_clean -k
+	dh_installdirs
 	# Add here commands to install the package into debian/tuxtype.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	rm $(CURDIR)/debian/tmp/usr/share/tuxtype/data/images/icons/tuxtype.ico
 	rmdir $(CURDIR)/debian/tmp/usr/share/tuxtype/data/images/icons/
 	dh_installdirs -ptuxtype-data  usr/share/
 	dh_installdirs
-	cp $(CURDIR)/debian/tuxtype.xpm $(CURDIR)/debian/tuxtype/usr/share/tuxtype/tuxtype.xpm
+	cp $(CURDIR)/debian/tuxtype.xpm $(CURDIR)/debian/tuxtype/usr/share/pixmaps/tuxtype.xpm
+	cp $(CURDIR)/debian/tuxtype.desktop $(CURDIR)/debian/tuxtype/usr/share/applications/tuxtype.desktop
 	rm $(CURDIR)/debian/tmp/usr/share/tuxtype/data/fonts/*.ttf
 	rmdir $(CURDIR)/debian/tmp/usr/share/tuxtype/data/fonts