Merge lp:~clint-fewbar/ubuntu/maverick/autoconf2.64/lp600991 into lp:ubuntu/maverick/autoconf2.64

[Clint Byrum]

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-03 17:24:27 +0000
+++ debian/changelog	2010-07-06 19:18:31 +0000
@@ -1,3 +1,9 @@
+autoconf2.64 (2.64-2ubuntu1) maverick; urgency=low
+
+  * debian/patches/02_autoreconf-aclocal.diff: Fixing for 2.64 (LP: #600991)
+
+ -- Clint Byrum <[e-mail]>  Mon, 05 Jul 2010 20:17:05 -0700
+
 autoconf2.64 (2.64-2) unstable; urgency=low
 
   * Upload to unstable, needed for gcc-snapshot (and gcc-4.5) builds.

=== modified file 'debian/patches/02_autoreconf-aclocal.diff'
--- debian/patches/02_autoreconf-aclocal.diff	2009-12-20 12:14:28 +0000
+++ debian/patches/02_autoreconf-aclocal.diff	2010-07-06 19:18:31 +0000
@@ -6,7 +6,7 @@
    $ENV{'SHELL'} = '@SHELL@' if ($^O eq 'dos');
 +
 +  # Make aclocal call the right autom4te version.
-+  $ENV{AUTOM4TE} = '/usr/bin/autom4te2.59';
++  $ENV{AUTOM4TE} = '/usr/bin/autom4te2.64';
  }
  
  use Autom4te::ChannelDefs;