diff -u mixxx-1.6.0/debian/changelog mixxx-1.6.0/debian/changelog
--- mixxx-1.6.0/debian/changelog
+++ mixxx-1.6.0/debian/changelog
@@ -1,9 +1,24 @@
+mixxx (1.6.0-1ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #262971):
+    - Update desktop file.
+
+ -- Nathan Handler <nhandler@ubuntu.com>  Sun, 09 Nov 2008 10:39:17 -0600
+
 mixxx (1.6.0-1) unstable; urgency=low
 
   * New upstream release (Closes: #496184)
 
  -- Free Ekanayaka <freee@debian.org>  Tue, 26 Aug 2008 00:53:21 +0100
 
+mixxx (1.6.0~beta3-2ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #243398):
+    - Update desktop file.
+    - Update maintainer field as per spec.
+
+ -- Nathan Handler <nathan.handler@gmail.com>  Thu, 26 Jun 2008 20:53:55 -0500
+
 mixxx (1.6.0~beta3-2) unstable; urgency=low
 
   * Build depend on libqt4-opengl-dev only if available, otherwise use
@@ -23,12 +38,43 @@
 
  -- Free Ekanayaka <freee@debian.org>  Thu, 05 Jun 2008 00:21:45 +0100
 
+mixxx (1.6.0~beta2-1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Update desktop file.
+    - Update maintainer field as per spec.
+  * debian/control: Build-depend on libqt4-opengl-dev.
+
+ -- Luke Yelavich <luke.yelavich@canonical.com>  Wed, 04 Jun 2008 13:25:54 +1000
+
 mixxx (1.6.0~beta2-1) unstable; urgency=low
 
   * New upstream release
 
  -- Free Ekanayaka <freee@debian.org>  Fri, 04 Apr 2008 12:02:15 +0200
 
+mixxx (1.6.0~beta2-0ubuntu1) hardy; urgency=low
+
+  * New upstream release.
+
+ -- Luke Yelavich <luke.yelavich@canonical.com>  Thu, 14 Feb 2008 11:09:19 +1100
+
+mixxx (1.6.0~beta1-1ubuntu2) hardy; urgency=low
+
+  * debian/mixxx.desktop
+    - Updated desktop file to reflect icon name change
+      (LP: #189598)
+
+ -- Joseph Jackson IV <jjacksoniv@fluxbuntu.org>  Wed, 06 Feb 2008 11:02:37 -0500
+
+mixxx (1.6.0~beta1-1ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Update desktop file.
+    - Update maintainer field as per spec.
+
+ -- Luke Yelavich <themuso@ubuntu.com>  Thu, 03 Jan 2008 23:09:53 +1100
+
 mixxx (1.6.0~beta1-1) unstable; urgency=low
 
   * New upstream release
@@ -39,6 +85,13 @@
 
  -- Free Ekanayaka <freee@debian.org>  Thu, 27 Dec 2007 09:53:41 +0000
 
+mixxx (1.5.2svn~20070807dfsg-0ubuntu1) gutsy; urgency=low
+
+  * New upstream release
+  * Updated maintainer field as per spec.
+
+ -- Albert Santoni <gamegod@users.sourceforge.net>  Wed,  8 Aug 2007 20:10:00 -0500
+
 mixxx (1.5.0.1-1) unstable; urgency=low
 
   * New upstream release (Closes: #424972)
@@ -52,6 +105,22 @@
 
  -- Free Ekanayaka <freee@debian.org>  Tue, 18 Dec 2007 13:01:13 +0000
 
+mixxx (1.5.0svn~20070130dfsg-0ubuntu1) feisty; urgency=low
+
+  * New upstream release
+  * Trimmed non-free files
+  * Mixxx now depends on libportaudio2 (PortAudio-v19 instead of -v18)
+
+ -- Albert Santoni <gamegod@users.sourceforge.net>  Sun,  28 Jan 2007 19:50:20 -0500
+
+mixxx (1.4.2-1.1ubuntu1) edgy; urgency=low
+
+  * Re-sync with Debian
+  * Drop Ubuntu GL/GLU fixes
+  * Fix .desktop file (Emmet Hikory)
+
+ -- Barry deFreese <bddebian@comcast.net>  Wed,  2 Aug 2006 12:46:20 -0400
+
 mixxx (1.4.2-1.1) unstable; urgency=high
 
   * Non-maintainer upload.
diff -u mixxx-1.6.0/debian/control mixxx-1.6.0/debian/control
--- mixxx-1.6.0/debian/control
+++ mixxx-1.6.0/debian/control
@@ -1,7 +1,8 @@
 Source: mixxx
 Section: sound
 Priority: optional
-Maintainer: Paul Brossier <piem@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Paul Brossier <piem@debian.org>
 Uploaders: Free Ekanayaka <freee@debian.org>
 Build-Depends: debhelper (>= 4.0.0), scons, pkg-config, docbook-to-man, xlibmesa-gl-dev, libglu1-mesa-dev, libqt4-opengl-dev | libqt4-dev, libjack-dev, libsamplerate-dev, portaudio19-dev, libid3tag0-dev, libmad0-dev, libogg-dev, libsndfile1-dev, libvorbis-dev, libexpat-dev, libglib1.2-dev, dpatch, libdjconsole-dev, libaudiofile-dev
 Standards-Version: 3.7.2
diff -u mixxx-1.6.0/debian/mixxx.desktop mixxx-1.6.0/debian/mixxx.desktop
--- mixxx-1.6.0/debian/mixxx.desktop
+++ mixxx-1.6.0/debian/mixxx.desktop
@@ -3,6 +3,6 @@
-Comment=a digital disc jockey interface
+Comment=A digital DJ interface
 Exec=mixxx
-Terminal=0
-Icon=/usr/share/pixmaps/mixxx.xpm
+Terminal=false
+Icon=mixxx-icon
 Type=Application
-Categories=Application;AudioVideo;
+Categories=AudioVideo;Audio;