diff -u xmms2-0.2DrJekyll/debian/control xmms2-0.2DrJekyll/debian/control
--- xmms2-0.2DrJekyll/debian/control
+++ xmms2-0.2DrJekyll/debian/control
@@ -1,10 +1,11 @@
 Source: xmms2
 Section: sound
 Priority: optional
-Maintainer: Florian Ragwitz <rafl@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+Original-Maintainer: Florian Ragwitz <rafl@debian.org>
 Uploaders: Jens Taprogge <jlt@taprogge.org>, Jonne Lehtinen <jms@modeemi.fi>
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5.0.37.2), dpatch, libsqlite3-dev, ruby, ruby1.8-dev, libperl-dev, python, python-dev, libglib2.0-dev, libcurl3-dev, libsmbclient-dev, libgnomevfs2-dev, libvorbis-dev, libshout-dev, libflac-dev, libmodplug-dev, libmad0-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64], libjack-dev, libavahi-client-dev, libgamin-dev, libmpcdec-dev, libmms-dev, libsidplay2-dev, libresid-builder-dev, libavformat-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64], libdc1394-dev [!kfreebsd-i386 !kfreebsd-amd64], libboost-dev, libboost-signals-dev, python-support (>= 0.3), python-pyrex, libfaad-dev, fftw3-dev, libsamplerate-dev, libao-dev, libcdio-cdda-dev, libdiscid0-dev, libxml2-dev, libexpat1-dev, libofa0-dev
+Build-Depends: debhelper (>= 5.0.37.2), dpatch, git-core, libsqlite3-dev, ruby, ruby1.8-dev, libperl-dev, python, python-dev, libglib2.0-dev, libcurl3-dev, libsmbclient-dev, libgnomevfs2-dev, libvorbis-dev, libshout-dev, libflac-dev, libmodplug-dev, libmad0-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64], libjack-dev, libavahi-client-dev, libgamin-dev, libmpcdec-dev, libmms-dev, libsidplay2-dev, libresid-builder-dev, libavformat-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64], libdc1394-dev [!kfreebsd-i386 !kfreebsd-amd64], libboost-dev, libboost-signals-dev, python-support (>= 0.3), python-pyrex, libfaad2-dev, fftw3-dev, libsamplerate-dev, libao-dev, libcdio-cdda-dev, libdiscid0-dev, libxml2-dev, libexpat1-dev, libofa0-dev
 XS-Python-Version: 2.4
 
 Package: xmms2
diff -u xmms2-0.2DrJekyll/debian/python-xmmsclient.install xmms2-0.2DrJekyll/debian/python-xmmsclient.install
--- xmms2-0.2DrJekyll/debian/python-xmmsclient.install
+++ xmms2-0.2DrJekyll/debian/python-xmmsclient.install
@@ -1 +1 @@
-usr/lib/python2.4/site-packages/*
+usr/lib/python2.5/site-packages/*
diff -u xmms2-0.2DrJekyll/debian/changelog xmms2-0.2DrJekyll/debian/changelog
--- xmms2-0.2DrJekyll/debian/changelog
+++ xmms2-0.2DrJekyll/debian/changelog
@@ -1,3 +1,12 @@
+xmms2 (0.2DrJekyll-1ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable
+     - Python version changed to 2.5
+     - Added git-core to build-deps to fix FTBFS
+     - Added Ubuntu MOTU Maintainer field, moved old one to Original-Maintainer
+
+ -- Siegfried-Angel Gevatter Pujals (RainCT) <siggi.gevatter@gmail.com>  Sat,  2 Jun 2007 22:11:46 +0200
+
 xmms2 (0.2DrJekyll-1) unstable; urgency=low
 
   * New upstream release.
@@ -29,6 +38,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.
@@ -138,0 +190 @@
+