diff -urN old/Makefile.am new/Makefile.am
--- old/Makefile.am	2007-08-05 23:21:41.000000000 +0200
+++ new/Makefile.am	2008-05-01 00:09:00.000000000 +0200
@@ -4,10 +4,9 @@
 
 intltool_extra = intltool-extract.in intltool-merge.in intltool-update.in
 
-EXTRA_DIST = $(intltool_extra) gnome-doc-utils.make
+EXTRA_DIST = $(intltool_extra)
 
 DISTCLEANFILES = 		\
-	gnome-doc-utils.make	\
 	intltool-extract 	\
 	intltool-merge 		\
 	intltool-update
diff -urN old/Makefile.in new/Makefile.in
--- old/Makefile.in	2007-08-05 23:21:41.000000000 +0200
+++ new/Makefile.in	2008-05-01 00:09:00.000000000 +0200
@@ -231,9 +231,8 @@
 
 # Applications 
 intltool_extra = intltool-extract.in intltool-merge.in intltool-update.in
-EXTRA_DIST = $(intltool_extra) gnome-doc-utils.make
+EXTRA_DIST = $(intltool_extra)
 DISTCLEANFILES = \
-	gnome-doc-utils.make	\
 	intltool-extract 	\
 	intltool-merge 		\
 	intltool-update
diff -urN old/data/Makefile.am new/data/Makefile.am
--- old/data/Makefile.am	2007-08-05 23:21:41.000000000 +0200
+++ new/data/Makefile.am	2008-05-01 00:09:00.000000000 +0200
@@ -5,7 +5,7 @@
 server_in_files = GNOME_VoiceControlApplet_Factory.server.in
 server_DATA     = $(server_in_files:.server.in=.server)
 
-APPLET_LOCATION=$(prefix)/libexec/voice_control_applet
+APPLET_LOCATION=$(libexecdir)/voice_control_applet
 APPLET_TYPE=exe
 
 $(server_in_files): $(server_in_files).in Makefile
diff -urN old/data/Makefile.in new/data/Makefile.in
--- old/data/Makefile.in	2007-08-05 23:21:41.000000000 +0200
+++ new/data/Makefile.in	2008-05-01 00:09:00.000000000 +0200
@@ -219,7 +219,7 @@
 serverdir = $(libdir)/bonobo/servers
 server_in_files = GNOME_VoiceControlApplet_Factory.server.in
 server_DATA = $(server_in_files:.server.in=.server)
-APPLET_LOCATION = $(prefix)/libexec/voice_control_applet
+APPLET_LOCATION = $(libexecdir)/voice_control_applet
 APPLET_TYPE = exe
 EXTRA_DIST = \
 	GNOME_VoiceControlApplet_Factory.server.in.in	\
diff -urN old/debian/changelog new/debian/changelog
--- old/debian/changelog	2008-04-21 00:08:30.000000000 +0200
+++ new/debian/changelog	2008-05-01 00:25:09.000000000 +0200
@@ -1,3 +1,13 @@
+gnome-voice-control (0.2-0ubuntu6) intrepid; urgency=low
+
+  * Remove automake call in debian/rules, and automake build-deb 
+    in debian/control, because build files are provided by upstream
+    (LP: #219303)
+  * Modified Makefile.{am,in} to make multibuild safe (LP: #150745)
+  * In data/Makefile.*: Re-apply changes from 0.2-0ubuntu2.
+
+ -- Sasa Bodiroza <jazzva@gmail.com>  Mon, 16 May 2008 23:45:00 +0200
+
 gnome-voice-control (0.2-0ubuntu5) hardy; urgency=low
 
   * debian/control:
diff -urN old/debian/control new/debian/control
--- old/debian/control	2008-04-21 00:08:30.000000000 +0200
+++ new/debian/control	2008-05-01 00:09:00.000000000 +0200
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
 XSBC-Original-Maintainer: Sasa Bodiroza <jazzva@gmail.com>
-Build-Depends: debhelper (>= 5), scrollkeeper, autotools-dev, libpanel-applet2-dev, libgtk-dev, libgnomeui-dev, libgstreamer0.10-dev, libwnck-dev, libatspi-dev, libsphinx2-dev, libxml-parser-perl, gnome-doc-utils, automake1.9
+Build-Depends: debhelper (>= 5), scrollkeeper, autotools-dev, libpanel-applet2-dev, libgtk-dev, libgnomeui-dev, libgstreamer0.10-dev, libwnck-dev, libatspi-dev, libsphinx2-dev, libxml-parser-perl, gnome-doc-utils
 Standards-Version: 3.7.3
 
 Package: gnome-voice-control
diff -urN old/debian/rules new/debian/rules
--- old/debian/rules	2008-04-21 00:08:30.000000000 +0200
+++ new/debian/rules	2008-05-01 00:09:00.000000000 +0200
@@ -20,7 +20,6 @@
 
 config.status: configure
 	dh_testdir
-	automake-1.9
 	$(CURDIR)/configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --libexecdir=/usr/lib/gnome-voice-control --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-sphinx2=/usr CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"