diff -u xmp-2.6.1/debian/changelog xmp-2.6.1/debian/changelog
--- xmp-2.6.1/debian/changelog
+++ xmp-2.6.1/debian/changelog
@@ -1,3 +1,14 @@
+xmp (2.6.1-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable (LP: #394058), remaining changes:
+    - Remove arts from dependencies.
+      + debian/control: Remove libartsc0-dev from build depends.
+      + debian/rules: Remove --enable-arts from ./configure
+  * debian/rules: Add --enable-pulseaudio from ./configure to provide 
+    PulseAudio support. Patch provided by Kevin Otte. (LP: #393718)
+
+ -- Andres Rodriguez <andreserl@ubuntu.com>  Tue, 30 Jun 2009 23:47:36 -0500
+
 xmp (2.6.1-1) unstable; urgency=low
 
   * New upstream version.
@@ -8,6 +19,14 @@
 
  -- Gürkan Sengün <gurkan@phys.ethz.ch>  Mon, 29 Jun 2009 22:20:49 +0200
 
+xmp (2.5.1-1ubuntu1) jaunty; urgency=low
+
+  * Remove arts from dependencies. (LP: #320915)
+    - debian/control: Remove libartsc0-dev from build depends.
+    - debian/rules: Remove --enable-arts from ./configure
+
+ -- Andreas Wenning <awen@awen.dk>  Thu, 29 Jan 2009 17:48:13 +0100
+
 xmp (2.5.1-1) unstable; urgency=low
 
   * New upstream version.
@@ -243,0 +263 @@
+
diff -u xmp-2.6.1/debian/control xmp-2.6.1/debian/control
--- xmp-2.6.1/debian/control
+++ xmp-2.6.1/debian/control
@@ -1,10 +1,11 @@
 Source: xmp
 Section: sound
 Priority: optional
-Maintainer: Gürkan Sengün <gurkan@phys.ethz.ch>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Gürkan Sengün <gurkan@phys.ethz.ch>
 Uploaders: William Pitcock <nenolod@sacredspiral.co.uk>
 Standards-Version: 3.8.2
-Build-Depends: debhelper (>= 7), libxext-dev, libx11-dev, libxt-dev, libesd0-dev (>= 0.2.36), libasound2-dev (>= 1.0) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386] | libasound-dev (>= 1.0) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudio-dev (>= 1.9), libartsc0-dev (>= 1.5.8), libpulse-dev, audacious-plugins-dev (>= 1.4), dpatch
+Build-Depends: debhelper (>= 7), libxext-dev, libx11-dev, libxt-dev, libesd0-dev (>= 0.2.36), libasound2-dev (>= 1.0) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386] | libasound-dev (>= 1.0) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudio-dev (>= 1.9), libpulse-dev, audacious-plugins-dev (>= 1.4), dpatch
 Homepage: http://xmp.sourceforge.net/
 
 Package: xmp-common
diff -u xmp-2.6.1/debian/rules xmp-2.6.1/debian/rules
--- xmp-2.6.1/debian/rules
+++ xmp-2.6.1/debian/rules
@@ -25,8 +25,8 @@
 		    	--mandir='$${prefix}/share/man' \
 		    	--enable-dynamic \
 		    	--enable-esd \
-		    	--enable-arts \
 		    	--enable-nas \
+			--enable-pulseaudio \
 			--enable-audacious-plugin
 	$(MAKE)
 	touch build-stamp