diff -Nru transcriber-1.5.1/debian/changelog transcriber-1.5.1/debian/changelog
--- transcriber-1.5.1/debian/changelog	2007-04-09 01:07:32.000000000 +0200
+++ transcriber-1.5.1/debian/changelog	2007-04-09 01:07:32.000000000 +0200
@@ -1,3 +1,11 @@
+transcriber (1.5.1-3ubuntu1) feisty; urgency=low
+
+  * Merge from Debian unstable, remaining changes
+    - Add .desktop file
+    - Change Maintainers field to Ubuntu MOTU Developers
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Mon, 09 Apr 2007 01:06:19 +0200
+
 transcriber (1.5.1-3) unstable; urgency=low
 
   * QA upload.
@@ -14,6 +22,14 @@
 
  -- Nico Golde <nion@debian.org>  Thu, 05 Apr 2007 13:33:07 +0200
 
+transcriber (1.5.1-2ubuntu1) feisty; urgency=low
+
+  * Link /usr/lib/transcriber1.5/doc to /usr/share/doc/transcriber/html (Malone #67268)
+  * Change Maintainers field to Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+  * Add .desktop (closes Malone #67260). An icon is still needed. 
+
+ -- Vassilis Pandis <pandisv@yahoo.co.uk>  Tue, 20 Feb 2007 17:11:44 +0000
+
 transcriber (1.5.1-2) unstable; urgency=low
 
   * Added explicit --x-includes /usr/X11R6/include --x-libraries
diff -Nru transcriber-1.5.1/debian/control transcriber-1.5.1/debian/control
--- transcriber-1.5.1/debian/control	2007-04-09 01:07:32.000000000 +0200
+++ transcriber-1.5.1/debian/control	2007-04-09 01:07:32.000000000 +0200
@@ -1,7 +1,8 @@
 Source: transcriber
 Section: sound
 Priority: extra
-Maintainer: Debian QA Group <packages@qa.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
 Build-Depends: debhelper (>=5), tcl8.4-dev, tk8.4-dev, libsnack2-dev (>=2.0.7), tclex (>=1.2a1-3), libx11-dev
 Standards-Version: 3.7.2
 
diff -Nru transcriber-1.5.1/debian/rules transcriber-1.5.1/debian/rules
--- transcriber-1.5.1/debian/rules	2007-04-09 01:07:32.000000000 +0200
+++ transcriber-1.5.1/debian/rules	2007-04-09 01:07:32.000000000 +0200
@@ -55,10 +55,13 @@
 	cd etc; find . -path '*/CVS' -prune -o -print | cpio -dpm ../debian/transcriber/etc/transcriber
 #	cd contrib; find html_library-0.3 | cpio -dpm ../debian/tmp/usr/lib
 #	rm debian/tmp/usr/lib/html_library-0.3/license.terms
+	install -m 644 -D debian/transcriber.desktop debian/tmp/usr/share/applications/transcriber.desktop
+	dh_desktop -ptranscriber
 	dh_installmenu
 	dh_installcron
 	dh_installchangelogs
 	dh_link etc/transcriber usr/lib/${packagelib}/etc
+	dh_link usr/share/doc/transcriber/html usr/lib/${packagelib}/doc
 	dh_compress
 	dh_fixperms
 	dh_installdeb
diff -Nru transcriber-1.5.1/debian/transcriber.desktop transcriber-1.5.1/debian/transcriber.desktop
--- transcriber-1.5.1/debian/transcriber.desktop	1970-01-01 01:00:00.000000000 +0100
+++ transcriber-1.5.1/debian/transcriber.desktop	2007-04-09 01:07:32.000000000 +0200
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Transcriber
+Comment=Transcribe speech data using an integrated editor
+TryExec=trans
+Exec=trans
+Icon=trans
+Categories=Audio;AudioVideo;