diff -u autoconf-2.64/debian/control autoconf-2.64/debian/control --- autoconf-2.64/debian/control +++ autoconf-2.64/debian/control @@ -1,7 +1,8 @@ Source: autoconf Section: devel Priority: optional -Maintainer: Ben Pfaff +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Ben Pfaff Standards-Version: 3.7.2 Build-Depends-Indep: texinfo (>= 4.6), m4 (>= 1.4.13), help2man Build-Depends: debhelper (>= 4) diff -u autoconf-2.64/debian/changelog autoconf-2.64/debian/changelog --- autoconf-2.64/debian/changelog +++ autoconf-2.64/debian/changelog @@ -1,3 +1,14 @@ +autoconf (2.64-4ubuntu1) lucid; urgency=low + + * Merge from debian testing, remaining changes: LP: #478334 + - bin/autoreconf.in: Check whether libtoolize supports --install, if it + does, libtoolize is safe to run at all times since it will not install + new files unless --install is passed to it as well. + * Fix autoconf requires m4 LP: #459422 + * Fix autoconf suggests installing autobook LP: #372701 + + -- Bhavani Shankar Sun, 08 Nov 2009 18:57:54 +0530 + autoconf (2.64-4) unstable; urgency=low * Add back Suggests: autoconf-archive removed in 2.64-3. I did check @@ -25,6 +36,15 @@ -- Ben Pfaff Mon, 17 Aug 2009 11:45:01 -0700 +autoconf (2.64-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: LP: #406182 + - bin/autoreconf.in: Check whether libtoolize supports --install, if it + does, libtoolize is safe to run at all times since it will not install + new files unless --install is passed to it as well. + + -- Bhavani Shankar Wed, 29 Jul 2009 11:17:05 +0530 + autoconf (2.64-1) unstable; urgency=low * New upstream release. @@ -39,12 +59,30 @@ -- Ben Pfaff Mon, 27 Jul 2009 19:58:29 -0700 +autoconf (2.63-3ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - bin/autoreconf.in: Check whether libtoolize supports --install, if it + does, libtoolize is safe to run at all times since it will not install + new files unless --install is passed to it as well. + + -- Muharem Hrnjadovic Tue, 05 May 2009 11:04:08 +0200 + autoconf (2.63-3) unstable; urgency=low * Upload to unstable. Closes: #501782. -- Ben Pfaff Sat, 28 Feb 2009 13:30:10 -0800 +autoconf (2.63-2ubuntu1) jaunty; urgency=low + + * Merge from Debian experimental, remaining changes: + * bin/autoreconf.in: Check whether libtoolize supports --install, if it + does, libtoolize is safe to run at all times since it will not install + new files unless --install is passed to it as well. + + -- Scott James Remnant Tue, 10 Feb 2009 11:19:19 +0000 + autoconf (2.63-2) experimental; urgency=low * Rebuilt with m4 1.4.11. Closes: #506875. @@ -69,6 +107,14 @@ -- Ben Pfaff Sat, 24 May 2008 21:41:28 -0700 +autoconf (2.61-7ubuntu1) intrepid; urgency=low + + * bin/autoreconf.in: Check whether libtoolize supports --install, if it + does, libtoolize is safe to run at all times since it will not install + new files unless --install is passed to it as well. + + -- Scott James Remnant Wed, 23 Jul 2008 11:07:05 +0100 + autoconf (2.61-7) unstable; urgency=low * lib/autoconf/functions.m4: Fix AC_FUNC_MKTIME to work properly with @@ -621,7 +667,7 @@ Closes: #161020. -- Ben Pfaff Tue, 17 Sep 2002 20:18:41 -0400 - + autoconf (2.53-5) unstable; urgency=low * Remove dependency on autoconf2.13. @@ -1101 +1146,0 @@ - only in patch2: unchanged: --- autoconf-2.64.orig/bin/autoreconf.in +++ autoconf-2.64/bin/autoreconf.in @@ -125,6 +125,8 @@ my $aclocal_supports_force = 0; # Does automake support --force-missing? my $automake_supports_force_missing = 0; +# Does libtoolize support --install? +my $libtoolize_supports_install = 0; my @prepend_include; my @include; @@ -185,6 +187,7 @@ $aclocal_supports_force = `$aclocal --help 2>/dev/null` =~ /--force/; $automake_supports_force_missing = `$automake --help 2>/dev/null` =~ /--force-missing/; + $libtoolize_supports_install = `$libtoolize --help` =~ /--install/; # Dispatch autoreconf's option to the tools. # --include; @@ -199,8 +202,9 @@ { $automake .= ' --add-missing'; $automake .= ' --copy' unless $symlink; - $libtoolize .= ' --copy' unless $symlink; + $libtoolize .= ' --install' if $libtoolize_supports_install; } + $libtoolize .= ' --copy' unless $symlink; # --force; if ($force) { @@ -528,7 +532,7 @@ { verb "$configure_ac: not using Libtool"; } - elsif ($install) + elsif ($install || $libtoolize_supports_install) { if ($uses_libltdl) {