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 16:09:18.000000000 +0100
@@ -1,3 +1,13 @@
+rosegarden (1:11.11.11-1ubuntu1) precise; urgency=low
+
+  * Merge from Debian testing (LP: #905015).
+  * Drop changes: 
+    - Fixed configure for multi-arch (LP: #832832), FTBFS with armel.
+  * Imported fix-multiarch-build.patch from upstream to fix corretly FTBFS
+    in 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 +15,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 +567,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 15:49:31.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/patches/fix-multiarch-build.patch rosegarden-11.11.11/debian/patches/fix-multiarch-build.patch
--- rosegarden-11.11.11/debian/patches/fix-multiarch-build.patch	1970-01-01 01:00:00.000000000 +0100
+++ rosegarden-11.11.11/debian/patches/fix-multiarch-build.patch	2011-12-16 15:49:13.000000000 +0100
@@ -0,0 +1,25 @@
+From: Stephen M. Webb
+Subject: Patch to fix FTBFS multiarch
+
+  Some Linux distros (eg. Debian, Ubuntu) are switching to a multiarch system. The
+  attached patch fixes failures to build from source on those distributions.
+
+  Verfied on amd64 and armel builds
+
+Origin: upstream, http://rosegarden.svn.sourceforge.net/viewvc/rosegarden/trunk/rosegarden/acinclude.m4?r1=11271&r2=12426
+Bug-Ubuntu: https://launchpad.net/bugs/905015
+---
+ acinclude.m4 |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- rosegarden-11.11.11-1ubuntu1.orig/acinclude.m4
++++ rosegarden-11.11.11-1ubuntu1/acinclude.m4
+@@ -145,7 +145,7 @@ if test x"$QTLIBDIR" = x ; then
+    	# bin is included because that's where Qt DLLs hide on Windows
+     # On Mandriva Qt libraries are in /usr/lib or /usr/lib64 although
+     # QTDIR is /usr/lib/qt4
+-	QTLIB_SEARCH="$QTDIR/lib $QTDIR/lib64 $QTDIR/lib32 $QTDIR/bin /usr/lib /usr/lib64"
++	QTLIB_SEARCH="$QTDIR/lib $QTDIR/lib64 $QTDIR/lib32 $QTDIR/bin /usr/lib /usr/lib/${build_alias} /usr/lib64"
+ else
+ 	case "$QTLIBDIR" in *3*)
+ 	     AC_MSG_WARN([
diff -Nru rosegarden-11.11.11/debian/patches/series rosegarden-11.11.11/debian/patches/series
--- rosegarden-11.11.11/debian/patches/series	2011-12-05 00:30:58.000000000 +0100
+++ rosegarden-11.11.11/debian/patches/series	2011-12-16 15:49:13.000000000 +0100
@@ -2,3 +2,4 @@
 linker-binutils-gold.patch
 fix-mime-types.patch
 fix-desktop-file.patch
+fix-multiarch-build.patch