diff -u cmus-2.2.0/debian/control cmus-2.2.0/debian/control
--- cmus-2.2.0/debian/control
+++ cmus-2.2.0/debian/control
@@ -1,10 +1,11 @@
 Source: cmus
 Section: sound
 Priority: optional
-Maintainer: Carlos Eduardo Sotelo Pinto (krlos) <krlos.aqp@gmail.com>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Carlos Eduardo Sotelo Pinto (krlos) <krlos.aqp@gmail.com>
 Build-Depends: debhelper (>= 7.0.0), dpatch, libflac-dev, libncursesw5-dev,
  libmodplug-dev, libmad0-dev, libvorbis-dev, libasound2-dev (>= 1.0.11) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libmpcdec-dev, libartsc0-dev, libao-dev, libfaad-dev, libwavpack-dev, libavformat-dev
+ libmpcdec-dev, libao-dev, libfaad-dev, libwavpack-dev, libavformat-dev, pkg-config
 Standards-Version: 3.8.1
 Homepage: http://cmus.sourceforge.net/
 
diff -u cmus-2.2.0/debian/changelog cmus-2.2.0/debian/changelog
--- cmus-2.2.0/debian/changelog
+++ cmus-2.2.0/debian/changelog
@@ -1,3 +1,13 @@
+cmus (2.2.0-4.1ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable (LP: #596323), remaining changes:
+    - debian/control:
+      + Continue to drop libartsc0-dev from Build-Depends.
+      + Build-Depends on pkg-config, missing due to libartsc0-dev build
+        depending on it down the chain.
+
+ -- Lorenzo De Liso <blackzldl@gmail.com>  Sat, 19 Jun 2010 19:34:09 +0200
+
 cmus (2.2.0-4.1) unstable; urgency=low
 
   * NMU
@@ -7,6 +17,28 @@
 
  -- Clint Adams <schizo@debian.org>  Sun, 31 Jan 2010 00:03:40 -0500
 
+cmus (2.2.0-4ubuntu3) lucid; urgency=low
+
+  * rebuild for ffmpeg versioned symbols
+
+ -- Reinhard Tartler <siretart@tauware.de>  Tue, 19 Jan 2010 20:54:37 +0100
+
+cmus (2.2.0-4ubuntu2) karmic; urgency=low
+
+  * No-change rebuild to pick up new ffmpeg shlibs file.
+
+ -- Stefan Potyra <sistpoty@ubuntu.com>  Sun, 30 Aug 2009 15:10:36 +0200
+
+cmus (2.2.0-4ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, Ubuntu remaining changes:
+    - debian/control:
+      + Continue to drop libartsc0-dev from Build-Depends.
+      + Build-Depends on pkg-config, missing due to libartsc0-dev build
+        depending on it down the chain.
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Sun, 29 Mar 2009 15:30:48 +0200
+
 cmus (2.2.0-4) unstable; urgency=low
 
   * Updated debian/watch file Closes: #449897
@@ -27,6 +59,24 @@
 
  -- Carlos Eduardo Sotelo Pinto (krlos) <krlos.aqp@gmail.com>  Thu, 19 Mar 2009 13:38:16 -0500
 
+cmus (2.2.0-3ubuntu2) jaunty; urgency=low
+
+  * Remove arts from dependencies. (LP: #320915)
+    - debian/control:
+      - Remove libartsc0-dev from build depends.
+      + Add pkg-config as build depends; now missing due to
+        libartsc0-dev build depending on it down the chain.
+
+ -- Andreas Wenning <awen@awen.dk>  Thu, 29 Jan 2009 06:16:20 +0100
+
+cmus (2.2.0-3ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable (LP: #313477), Ubuntu remaining changes:
+    - ffmpeg.c: use correct headers location to fix FTBFS with recent ffmpeg
+      snapshots (LP: #311007).
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Sat, 03 Jan 2009 15:54:50 +0100
+
 cmus (2.2.0-3) unstable; urgency=low
 
   * Acknowledging NMU.  Closes: #509277.
@@ -41,6 +91,14 @@
 
  -- Carlos Eduardo Sotelo Pinto (krlos) <krlos.aqp@gmail.com>  Wed, 03 Sep 2008 17:46:50 -0500
 
+cmus (2.2.0-1.1ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable (LP: #312215), Ubuntu remaining changes:
+    - ffmpeg.c: use correct headers location to fix FTBFS with recent ffmpeg
+      snapshots (LP: #311007).
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Mon, 29 Dec 2008 17:36:47 +0100
+
 cmus (2.2.0-1.1) unstable; urgency=high
 
   * Non-maintainer upload by the Security Team.
@@ -51,6 +109,25 @@
 
  -- Moritz Muehlenhoff <jmm@debian.org>  Sun, 28 Dec 2008 14:57:06 +0100
 
+cmus (2.2.0-1ubuntu1) jaunty; urgency=low
+
+  * ffmpeg.c: use correct headers location to fix FTBFS with recent ffmpeg
+    snapshots (LP: #311007).
+
+ -- Lionel Le Folgoc <mrpouit@ubuntu.com>  Fri, 26 Dec 2008 13:08:26 +0100
+
+cmus (2.2.0-1build2) jaunty; urgency=low
+
+  * Rebuild to pickup ffmpeg's new shlibs (LP: #289600).
+
+ -- Lionel Le Folgoc <mrpouit@ubuntu.com>  Thu, 06 Nov 2008 22:16:39 +0100
+
+cmus (2.2.0-1build1) intrepid; urgency=low
+
+  * Rebuild for ffmpeg -> ffmpeg-free transition (LP: #245576). 
+
+ -- Michael Bienia <geser@ubuntu.com>  Tue, 08 Jul 2008 16:02:28 +0200
+
 cmus (2.2.0-1) unstable; urgency=low
 
   * New upstream release