diff -u autogen-5.12/debian/rules autogen-5.12/debian/rules
--- autogen-5.12/debian/rules
+++ autogen-5.12/debian/rules
@@ -5,6 +5,8 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+export SHELL=/bin/bash
+
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	DEBUG_FLAGS = --enable-debug
 endif
diff -u autogen-5.12/debian/control autogen-5.12/debian/control
--- autogen-5.12/debian/control
+++ autogen-5.12/debian/control
@@ -1,7 +1,8 @@
 Source: autogen
 Section: devel
 Priority: optional
-Maintainer: Bradley Smith <bradsmith@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Bradley Smith <bradsmith@debian.org>
 Build-Depends: debhelper (>= 7), autotools-dev, gperf, guile-1.8-dev, libxml2-dev, texinfo, texlive, texi2html, quilt
 Standards-Version: 3.8.3
 Homepage: http://www.gnu.org/software/autogen/
diff -u autogen-5.12/debian/changelog autogen-5.12/debian/changelog
--- autogen-5.12/debian/changelog
+++ autogen-5.12/debian/changelog
@@ -1,3 +1,12 @@
+autogen (1:5.12-0.1ubuntu1) oneiric; urgency=low
+
+  * Merge from debian unstable. (LP: #817044) Remaining changes:
+    - Use bash to build the package and run the tests.
+  * Dropped change, fixed in Debian:
+    - Avoid building and testing the package twice.
+
+ -- Angel Abad <angelabad@ubuntu.com>  Wed, 27 Jul 2011 17:03:16 +0200
+
 autogen (1:5.12-0.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -10,6 +19,13 @@
 
  -- Kurt Roeckx <kurt@roeckx.be>  Sun, 10 Jul 2011 15:05:23 +0200
 
+autogen (1:5.11.9-0.2ubuntu1) oneiric; urgency=low
+
+  * Use bash to build the package and run the tests. LP: #794596.
+  * Avoid building and testing the package twice.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 08 Jun 2011 16:38:19 +0200
+
 autogen (1:5.11.9-0.2) unstable; urgency=low
 
   * Non-maintainer upload.