diff -Nru rosegarden-11.11.11/debian/changelog rosegarden-11.11.11/debian/changelog
--- rosegarden-11.11.11/debian/changelog	2011-12-05 00:40:30.000000000 +0100
+++ rosegarden-11.11.11/debian/changelog	2011-12-16 17:04:16.000000000 +0100
@@ -1,3 +1,14 @@
+rosegarden (1:11.11.11-1ubuntu1) precise; urgency=low
+
+  * Merge from Debian testing (LP: #905015).  Remaining changes:
+  * Drop changes:
+    - Fixed configure for multi-arch (LP: #832832).
+  * debian/rules:
+    - add --with-qtlibdir at override_dh_auto_configure to fix
+      FTBFS with multiarch, thanks to Andreas Moog.
+
+ -- Leo Iannacone <l3on@ubuntu.com>  Thu, 15 Dec 2011 23:34:07 +0100
+
 rosegarden (1:11.11.11-1) unstable; urgency=low
 
   * New upstream release.
@@ -5,6 +16,12 @@
 
  -- Alessio Treglia <alessio@debian.org>  Mon, 05 Dec 2011 00:39:23 +0100
 
+rosegarden (1:11.06-1ubuntu1) oneiric; urgency=low
+
+  * Fixed configure for multi-arch (LP: #832832).
+
+ -- Stephen M. Webb <stephen@ubuntu.com>  Mon, 12 Sep 2011 14:02:05 -0400
+
 rosegarden (1:11.06-1) unstable; urgency=low
 
   * New upstream release:
@@ -551,3 +568,4 @@
   * Added definitions for installation of mcop related stuff in sound/Makefile.am
 
  -- Enrique Robledo Arnuncio <era@debian.org>  Sat,  8 Jun 2002 20:37:35 +0200
+
diff -Nru rosegarden-11.11.11/debian/control rosegarden-11.11.11/debian/control
--- rosegarden-11.11.11/debian/control	2011-05-19 19:54:51.000000000 +0200
+++ rosegarden-11.11.11/debian/control	2011-12-16 17:01:59.000000000 +0100
@@ -1,7 +1,8 @@
 Source: rosegarden
 Section: sound
 Priority: optional
-Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
 Uploaders: Free Ekanayaka <freee@debian.org>,
  Stuart Prescott <stuart+debian@nanonanonano.net>,
  Alessio Treglia <alessio@debian.org>
diff -Nru rosegarden-11.11.11/debian/rules rosegarden-11.11.11/debian/rules
--- rosegarden-11.11.11/debian/rules	2011-05-19 19:54:51.000000000 +0200
+++ rosegarden-11.11.11/debian/rules	2011-12-16 17:01:59.000000000 +0100
@@ -28,7 +28,7 @@
 
 override_dh_auto_configure:
 	sh ./bootstrap.sh
-	dh_auto_configure -- --enable-debug
+	dh_auto_configure -- --enable-debug --with-qtlibdir=/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 override_dh_auto_test: