diff -u soundtouch-1.3.0/debian/changelog soundtouch-1.3.0/debian/changelog
--- soundtouch-1.3.0/debian/changelog
+++ soundtouch-1.3.0/debian/changelog
@@ -1,3 +1,13 @@
+soundtouch (1.3.0-2.2ubuntu0.1) hardy-proposed; urgency=low
+
+  * 09_underquoted_m4.patch - Fix aclocal warning:
+    "underquoted definition in soundtouch.m4" (LP: #221205).
+  * Set aclocal version to 1.10 in debian/rules and changed build depends from
+    automake1.7 to automake in debian/control to fix FTBFS on amd64.
+  * debian/control: Update Maintainer field
+
+ -- Benjamin Drung <benjamin.drung@gmail.com>  Fri, 04 Jul 2008 17:52:20 +0200
+
 soundtouch (1.3.0-2.2) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u soundtouch-1.3.0/debian/control soundtouch-1.3.0/debian/control
--- soundtouch-1.3.0/debian/control
+++ soundtouch-1.3.0/debian/control
@@ -1,8 +1,9 @@
 Source: soundtouch
 Priority: optional
 Section: libs
-Maintainer: Guenter Geiger (Debian/GNU) <geiger@debian.org>
-Build-Depends: debhelper (>= 4.0.0), cdbs, unzip, automake1.7, libtool, autoconf
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Guenter Geiger (Debian/GNU) <geiger@debian.org>
+Build-Depends: debhelper (>= 4.0.0), cdbs, unzip, automake, libtool, autoconf
 Standards-Version: 3.6.2
 
 Package: libsoundtouch1-dev
diff -u soundtouch-1.3.0/debian/rules soundtouch-1.3.0/debian/rules
--- soundtouch-1.3.0/debian/rules
+++ soundtouch-1.3.0/debian/rules
@@ -8,7 +8,7 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/config
-DEB_AUTO_UPDATE_ACLOCAL := 1.7
+DEB_AUTO_UPDATE_ACLOCAL := 1.10
 DEB_AUTO_UPDATE_LIBTOOL := pre
 DEB_AUTO_UPDATE_AUTOCONF := 2.50
 
only in patch2:
unchanged:
--- soundtouch-1.3.0.orig/debian/patches/09_underquoted_m4.patch
+++ soundtouch-1.3.0/debian/patches/09_underquoted_m4.patch
@@ -0,0 +1,12 @@
+diff -Nur SoundTouch-1.3.0.old/soundtouch.m4 SoundTouch-1.3.0/soundtouch.m4
+--- SoundTouch-1.3.0.old/soundtouch.m4	2003-12-25 12:36:08.000000000 +0100
++++ SoundTouch-1.3.0/soundtouch.m4	2008-06-07 22:52:22.000000000 +0200
+@@ -26,7 +26,7 @@
+ SOUNDTOUCH_CXXFLAGS=""
+ SOUNDTOUCH_LIBS=""
+ 
+-AC_DEFUN(AM_PATH_SOUNDTOUCH,[
++AC_DEFUN([AM_PATH_SOUNDTOUCH],[
+ 	AC_ARG_WITH(soundtouch-prefix,[  --with-soundtouch-prefix=DIR   Prefix where SoundTouch was installed (optional)], [soundtouch_prefix="$withval"],[soundtouch_prefix=""])
+ 
+ 	AC_ARG_ENABLE(soundtouch-check,[  --disable-soundtouch-check   Do not look for the SoundTouch Library],[enable_soundtouch_check="$enableval"],[enable_soundtouch_check="yes"])