diff -pruN 1.8.8p5-1.1/debian/changelog 1.8.8p5-1.1ubuntu1/debian/changelog
--- 1.8.8p5-1.1/debian/changelog	2021-01-06 00:46:02.000000000 +0000
+++ 1.8.8p5-1.1ubuntu1/debian/changelog	2021-01-06 00:46:02.000000000 +0000
@@ -1,3 +1,10 @@
+wavesurfer (1.8.8p5-1.1ubuntu1) hirsute; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/{wavesurfer.desktop,rules}: Add and install a .desktop file.
+
+ -- Logan Rosen <logan@ubuntu.com>  Tue, 05 Jan 2021 15:03:33 -0500
+
 wavesurfer (1.8.8p5-1.1) unstable; urgency=medium
 
   * Non maintainer upload by the Reproducible Builds team.
@@ -5,6 +12,14 @@ wavesurfer (1.8.8p5-1.1) unstable; urgen
 
  -- Holger Levsen <holger@debian.org>  Sun, 03 Jan 2021 19:56:26 +0100
 
+wavesurfer (1.8.8p5-1ubuntu1) cosmic; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/{wavesurfer.desktop,rules}: Add and install a .desktop file.
+  * wavesurfer now depends on tk8.6 (LP: #1630367).
+
+ -- Logan Rosen <logan@ubuntu.com>  Sat, 08 Sep 2018 20:54:37 +0000
+
 wavesurfer (1.8.8p5-1) unstable; urgency=medium
 
   * This upstream release merges most of the patches we added between the
@@ -29,6 +44,14 @@ wavesurfer (1.8.8p5-1) unstable; urgency
 
  -- Ron Lee <ron@debian.org>  Sun, 18 Mar 2018 05:28:06 +1030
 
+wavesurfer (1.8.8p4-3ubuntu1) vivid; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/{wavesurfer.desktop,rules}: Add and install a .desktop file.
+  * Debian removed wish from Depends (LP: #1068509).
+
+ -- Logan Rosen <logan@ubuntu.com>  Sun, 16 Nov 2014 23:51:34 -0500
+
 wavesurfer (1.8.8p4-3) unstable; urgency=medium
 
   * Fix broken initialisation of (Prefs,PrintCmd).  This appears to have been
@@ -63,6 +86,20 @@ wavesurfer (1.8.8p4-3) unstable; urgency
 
  -- Ron Lee <ron@debian.org>  Tue, 03 Jun 2014 04:37:04 +0930
 
+wavesurfer (1.8.8p4-2ubuntu2) trusty; urgency=low
+
+  * Rebuild for libsnack soname bump.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 15 Nov 2013 11:12:15 +0100
+
+wavesurfer (1.8.8p4-2ubuntu1) saucy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Add a .desktop file and validate it with the latest desktop-file-
+      validate.
+
+ -- Logan Rosen <logan@ubuntu.com>  Sun, 08 Sep 2013 15:32:51 -0400
+
 wavesurfer (1.8.8p4-2) unstable; urgency=low
 
   * Catch the error thrown from 'canvas lower top topmost' when no items with
@@ -71,6 +108,14 @@ wavesurfer (1.8.8p4-2) unstable; urgency
 
  -- Ron Lee <ron@debian.org>  Sat, 07 Sep 2013 22:37:48 +0930
 
+wavesurfer (1.8.8p4-1ubuntu1) saucy; urgency=low
+
+  * Merge from Debian unstable (LP: #958654). Remaining changes:
+    - Add a .desktop file and validate it with the latest desktop-file-
+      validate.
+
+ -- Logan Rosen <logan@ubuntu.com>  Wed, 15 May 2013 18:48:33 -0400
+
 wavesurfer (1.8.8p4-1) unstable; urgency=low
 
   * Fixes bugs with waveform scaling, the config dialog, and "selection start
@@ -80,6 +125,14 @@ wavesurfer (1.8.8p4-1) unstable; urgency
 
  -- Ron Lee <ron@debian.org>  Sun, 12 May 2013 10:24:22 +0930
 
+wavesurfer (1.8.8p3-1ubuntu1) oneiric; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - Add a .desktop file and validate it with the latest desktop-file-
+      validate
+
+ -- Angel Abad <angelabad@ubuntu.com>  Wed, 25 May 2011 18:04:28 +0200
+
 wavesurfer (1.8.8p3-1) unstable; urgency=low
 
   * Rearrange things for the new upstream source tree layout.
@@ -98,6 +151,14 @@ wavesurfer (1.8.5-4) unstable; urgency=l
 
  -- Ron Lee <ron@debian.org>  Mon, 02 May 2011 09:56:25 +0930
 
+wavesurfer (1.8.5-3ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable(LP: #701871). Remaining change:
+    - Add a .desktop file and validate it with the latest desktop-file-
+      validate
+
+ -- Mahyuddin Susanto <udienz@gmail.com>  Thu, 13 Jan 2011 04:15:29 +0700
+
 wavesurfer (1.8.5-3) unstable; urgency=high
 
   * QA upload.
@@ -106,12 +167,26 @@ wavesurfer (1.8.5-3) unstable; urgency=h
 
  -- Salvatore Bonaccorso <carnil@debian.org>  Wed, 29 Dec 2010 09:18:37 +0100
 
+wavesurfer (1.8.5-2ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Added a .desktop file
+  * debian/control: Change Maintainer/XSBC-Original-Maintainer field.
+
+ -- Michael Bienia <geser@ubuntu.com>  Thu,  1 Mar 2007 12:57:22 +0100
+
 wavesurfer (1.8.5-2) unstable; urgency=low
 
   * Fixed multi channel mode for n-waveform (closes: #410276)
 
  -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Mon, 12 Feb 2007 12:32:15 +0100
 
+wavesurfer (1.8.5-1ubuntu1) dapper; urgency=low
+
+  * Added a .desktop file from Emmet Hikory (Closes: #28884)
+
+ -- Dana Olson <dana@ubuntustudio.com>  Fri, 24 Feb 2006 10:22:08 -0500
+
 wavesurfer (1.8.5-1) unstable; urgency=low
 
   * New upstream version
@@ -245,3 +320,4 @@ wavesurfer (1.0.4-1) unstable; urgency=l
 Local variables:
 mode: debian-changelog
 End:
+
diff -pruN 1.8.8p5-1.1/debian/control 1.8.8p5-1.1ubuntu1/debian/control
--- 1.8.8p5-1.1/debian/control	2021-01-06 00:46:02.000000000 +0000
+++ 1.8.8p5-1.1ubuntu1/debian/control	2021-01-06 00:46:02.000000000 +0000
@@ -1,7 +1,8 @@
 Source: wavesurfer
 Section: sound
 Priority: optional
-Maintainer: Ron Lee <ron@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Ron Lee <ron@debian.org>
 Build-Depends: debhelper (>= 9)
 Standards-Version: 4.1.3.0
 Homepage: http://www.speech.kth.se/wavesurfer
diff -pruN 1.8.8p5-1.1/debian/rules 1.8.8p5-1.1ubuntu1/debian/rules
--- 1.8.8p5-1.1/debian/rules	2021-01-06 00:46:02.000000000 +0000
+++ 1.8.8p5-1.1ubuntu1/debian/rules	2021-01-06 00:46:02.000000000 +0000
@@ -22,6 +22,7 @@ binary-indep:
 	dh_install 	-XREADME.txt -Xexample1.plug -Xexample2.plug	\
 			src/*			usr/share/tcltk/wavesurfer
 	dh_install 	debian/ws32.xpm		usr/share/pixmaps
+	dh_install	debian/wavesurfer.desktop 	usr/share/applications
 	dh_install 	wavesurfer		usr/bin
 	dh_installman 	debian/wavesurfer.1
 	dh_installdocs	doc
diff -pruN 1.8.8p5-1.1/debian/wavesurfer.desktop 1.8.8p5-1.1ubuntu1/debian/wavesurfer.desktop
--- 1.8.8p5-1.1/debian/wavesurfer.desktop	1970-01-01 00:00:00.000000000 +0000
+++ 1.8.8p5-1.1ubuntu1/debian/wavesurfer.desktop	2021-01-06 00:46:02.000000000 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=wavesurfer
+GenericName=
+Comment=Manipulate sound files
+Icon=ws32
+Exec=/usr/bin/wavesurfer
+Terminal=false
+Categories=AudioVideo;Audio;Player;
