diff -u xmms2-0.6DrMattDestruction/debian/rules xmms2-0.6DrMattDestruction/debian/rules
--- xmms2-0.6DrMattDestruction/debian/rules
+++ xmms2-0.6DrMattDestruction/debian/rules
@@ -15,7 +15,8 @@
 	--with-ruby-archdir=$(RUBYARCHDIR) \
 	--with-ruby-libdir=$(RUBYLIBDIR) \
 	--without-optionals=python \
-	--without-plugins=mac
+	--without-plugins=mac \
+	--with-default-output-plugin=pulse
 
 export NOCOLOR=1
 
diff -u xmms2-0.6DrMattDestruction/debian/control xmms2-0.6DrMattDestruction/debian/control
--- xmms2-0.6DrMattDestruction/debian/control
+++ xmms2-0.6DrMattDestruction/debian/control
@@ -1,7 +1,8 @@
 Source: xmms2
 Section: sound
 Priority: optional
-Maintainer: Florian Ragwitz <rafl@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Florian Ragwitz <rafl@debian.org>
 Uploaders: Jens Taprogge <jlt@taprogge.org>,
            Jonne Lehtinen <jms@modeemi.fi>,
            Anders Waldenborg <anders@0x63.nu>,
@@ -65,6 +66,7 @@
          xmms2-plugin-id3v2,
          xmms2-plugin-mad,
          xmms2-plugin-oss [kfreebsd-i386 kfreebsd-amd64],
+         xmms2-plugin-pulse,
          xmms2-plugin-vorbis,
          ${misc:Depends}
 Conflicts: xmms2-plugin-nulstripper
diff -u xmms2-0.6DrMattDestruction/debian/changelog xmms2-0.6DrMattDestruction/debian/changelog
--- xmms2-0.6DrMattDestruction/debian/changelog
+++ xmms2-0.6DrMattDestruction/debian/changelog
@@ -1,3 +1,10 @@
+xmms2 (0.6DrMattDestruction-3ubuntu1) karmic; urgency=low
+
+  * Merge from Debian unstable, no remaining changes.
+  * Use PulseAudio as default output plugin (LP: #398481).
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Sun, 09 Aug 2009 21:18:24 +0200
+
 xmms2 (0.6DrMattDestruction-3) unstable; urgency=high
 
   * xmms2-icon conflicts & replaces older xmms2-core (Closes: #540138).
@@ -48,6 +55,19 @@
 
  -- Benjamin Drung <bdrung@ubuntu.com>  Sun, 05 Jul 2009 20:24:28 +0200
 
+xmms2 (0.6DrMattDestruction-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Build for Python 2.6.
+      + debian/rules: Don't refer to python2.[45] in clean; expand from PYVERS
+        instead.
+      + debian/python-xmmsclient.install: Wildcard out the need for 2.[45] or
+        site-packages references.
+    - Add lpia to xmms2-plugin-alsa supported architectures.
+    - Add liba52-0.7.4-dev to Build-Depends.
+
+ -- William Grant <wgrant@ubuntu.com>  Wed, 20 May 2009 07:56:34 +1000
+
 xmms2 (0.6DrMattDestruction-1) unstable; urgency=low
 
   * New upstream release.
@@ -77,6 +97,40 @@
 
  -- Adeodato Simó <dato@net.com.org.es>  Tue, 10 Mar 2009 15:02:58 +0000
 
+xmms2 (0.5DrLecter-2ubuntu3) jaunty; urgency=low
+
+  * Build for Python 2.6.
+    - debian/rules: Don't refer to python2.[45] in clean; expand from PYVERS
+      instead.
+    - debian/python-xmmsclient.install: Wildcard out the need for 2.[45] or
+      site-packages references.
+
+ -- William Grant <wgrant@ubuntu.com>  Mon, 09 Mar 2009 22:10:28 +1100
+
+xmms2 (0.5DrLecter-2ubuntu2) jaunty; urgency=low
+
+  * Rebuild to pickup ffmpeg's new shlibs (LP: #289600)
+  * debian/patches/02_latest_avcodec_compatibility.patch: fix compilation
+    against newer libavcodec/ffmpeg (cherry-pick from upstream xmms2-tilman.git,
+    commits d09c0d8a971c0333a0c8387113f744f0b9899fe4 and
+    fccc583328ca58110a8b6e00ccb8c0bb1f6923ad).
+
+ -- Lionel Le Folgoc <mrpouit@ubuntu.com>  Sun, 16 Nov 2008 16:05:00 +0100
+
+xmms2 (0.5DrLecter-2ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable (LP: #241098), remaining changes:
+    + debian/control:
+      + Update Maintainer field
+      + add lpia to xmms2-plugin-alsa supported architectures
+      + Added liba52-0.7.4-dev to build depends
+    + debian/rules: Added patch, patch-stamp and unpatch
+    + changed 01_gcc4.3.patch:
+      + src/include/xmmsclient/xmmsclient++/helpers.h: Added #include <climits>
+  * New upstream relase fixes LP: #212566, #222341
+
+ -- Benjamin Drung <benjamin.drung@gmail.com>  Fri, 04 Jul 2008 16:23:34 +0200
+
 xmms2 (0.5DrLecter-2) unstable; urgency=medium
 
   * Make wma playback work with the latest libavcodec.
@@ -106,6 +160,25 @@
 
  -- Florian Ragwitz <rafl@debian.org>  Sun, 22 Jun 2008 12:53:18 +0200
 
+xmms2 (0.4DrKosmos-4ubuntu2) intrepid; urgency=low
+
+  * Fix FTBFS with gcc 4.3 (LP: #237497):
+    - src/include/xmmsclient/xmmsclient++/helpers.h: Added #include <limits.h>
+    - debian/control: Added liba52-0.7.4-dev to build depends
+    - debian/rules: Added patch, patch-stamp and unpatch
+  * Rebuild for the perl 5.10 transition (LP: #230016).
+
+ -- Benjamin Drung <benjamin.drung@gmail.com>  Thu, 05 Jun 2008 02:22:24 +0200
+
+xmms2 (0.4DrKosmos-4ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable (LP: #178477), remaining changes:
+    - debian/control: Update Maintainer field
+    - debian/control: add lpia to xmms2-plugin-alsa supported architectures
+  * This version reads AAC files (LP: #156359)
+
+ -- Benjamin Drung <benjamin.drung@gmail.com>  Thu, 29 May 2008 10:14:25 +0200
+
 xmms2 (0.4DrKosmos-4) unstable; urgency=low
 
   * Make all packages that ship pkg-config files depend on pkg-config.
@@ -178,6 +251,36 @@
 
  -- Florian Ragwitz <rafl@debian.org>  Sat, 09 Feb 2008 21:55:10 +0100
 
+xmms2 (0.2DrJekyll-4ubuntu4) hardy; urgency=low
+
+  * Change fftw3-dev to libfftw3-dev.
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Wed, 19 Dec 2007 22:19:52 +1100
+
+xmms2 (0.2DrJekyll-4ubuntu3) hardy; urgency=low
+
+  * debian/control: add lpia to xmms2-plugin-alsa supported architectures
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Sat, 17 Nov 2007 12:26:17 +0100
+
+xmms2 (0.2DrJekyll-4ubuntu2) gutsy; urgency=low
+
+  * Rebuild for boost 1.34.0 -> 1.34.1 transistion.
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Thu, 13 Sep 2007 11:06:53 +1000
+
+xmms2 (0.2DrJekyll-4ubuntu1) gutsy; urgency=low
+
+  * Rebuild for the libcurl4 -> libcurl3 back transition.
+  * Merge from debian unstable, remaining changes:
+    - debian/python-xmmsclient.install: Fix path for python 2.5 module
+    - debian/control: Remove faad2 dependency and don't build xmms-plugin-faad
+    - debian/control: Update Maintainer field
+  * debian/control:
+    - Replace libcurl3-openssl-dev with libcurl4-openssl-dev in Build-Depends.
+
+ -- Michael Bienia <geser@ubuntu.com>  Mon, 02 Jul 2007 23:52:40 +0200
+
 xmms2 (0.2DrJekyll-4) unstable; urgency=low
 
   * Explicitally compile all of sid plugin with -fPIC (Closes: #429869).
@@ -185,6 +288,14 @@
 
  -- Thomas Jollans <thomas@jollans.com>  Thu, 21 Jun 2007 17:07:01 +0200
 
+xmms2 (0.2DrJekyll-3ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/python-xmmsclient.install: Fix path for python 2.5 module
+    - debian/control: Remove faad2 dependency and don't build xmms-plugin-faad
+
+ -- Zak B. Elep <zakame@ubuntu.com>  Tue, 19 Jun 2007 17:34:40 +0800
+
 xmms2 (0.2DrJekyll-3) unstable; urgency=low
 
   * Don't dump core on fatal errors (Closes: #419998).
@@ -206,6 +317,21 @@
 
  -- Florian Ragwitz <rafl@debian.org>  Sun, 17 Jun 2007 21:54:53 +0200
 
+xmms2 (0.2DrJekyll-1ubuntu2) gutsy; urgency=low
+
+  * debian/control:
+    - Remove faad2 dependency, as it is currently in multiverse;
+      do not build faad2-needing packages.
+
+ -- Zak B. Elep <zakame@ubuntu.com>  Thu, 14 Jun 2007 16:57:01 +0800
+
+xmms2 (0.2DrJekyll-1ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/python-xmmsclient.install: Fix path for python 2.5 module
+
+ -- Zak B. Elep <zakame@ubuntu.com>  Thu, 14 Jun 2007 13:56:46 +0800
+
 xmms2 (0.2DrJekyll-1) unstable; urgency=low
 
   * New upstream release.
@@ -237,6 +363,48 @@
 
  -- Florian Ragwitz <rafl@debian.org>  Mon,  2 Apr 2007 15:31:28 +0200
 
+xmms2 (0.2DrHouse-3.1ubuntu3) feisty; urgency=low
+
+  * debian/control:
+    - Added git-core to build-deps to fix FTBFS
+    - Added Ubuntu MOTU Maintainer field, moved old one to Original-Maintainer
+
+ -- Stephan Hermann <sh@sourcecode.de>  Tue,  6 Feb 2007 18:28:23 +0100
+
+xmms2 (0.2DrHouse-3.1ubuntu2) feisty; urgency=low
+
+  * Try to find out why the build fails on the buildds:
+    - show the config.log if scons fails
+
+ -- Michael Bienia <geser@ubuntu.com>  Mon,  5 Feb 2007 13:48:47 +0100
+
+xmms2 (0.2DrHouse-3.1ubuntu1) feisty; urgency=low
+
+  * debian/python-xmmsclient.install: Fix path for python 2.5 module 
+
+ -- Michael Bienia <geser@ubuntu.com>  Wed, 31 Jan 2007 13:17:31 +0100
+
+xmms2 (0.2DrHouse-3.1) unstable; urgency=high
+
+  [ Andreas Henriksson ]
+  * NMU
+  * Revert to build xmms2 without faad plugin, since faad library is being
+    removed from Etch. (Reopens: #399339, Closes: #404304)
+
+  [ Andreas Barth ]
+  * Uploading to unstable.
+  * Replace typo XB-Python... with XS-Python in debian/control
+
+ -- Andreas Barth <aba@not.so.argh.org>  Sun,  7 Jan 2007 09:21:21 +0000
+
+xmms2 (0.2DrHouse-3) unstable; urgency=low
+
+  * Use dh_makeshlibs -V to generate more strict shlib files.
+  * Fix a typo in debian/control.
+  * Remove some unused stuff fron debian/control.
+
+ -- Florian Ragwitz <rafl@debian.org>  Fri, 15 Dec 2006 00:46:59 +0100
+
 xmms2 (0.2DrHouse-2) unstable; urgency=low
 
   * Add xmms2-plugin-ao.