diff -Nru dh-autoreconf-10/debian/changelog dh-autoreconf-12~bpo8+1~vivid/debian/changelog --- dh-autoreconf-10/debian/changelog 2014-09-25 13:40:48.000000000 +0000 +++ dh-autoreconf-12~bpo8+1~vivid/debian/changelog 2017-05-17 21:29:37.000000000 +0000 @@ -1,3 +1,38 @@ +dh-autoreconf (12~bpo8+1~vivid) vivid; urgency=medium + + * backport to vivid + + -- Hans-Christoph Steiner Wed, 17 May 2017 23:29:15 +0200 + +dh-autoreconf (12~bpo8+1) jessie-backports; urgency=medium + + * Rebuild for jessie-backports. + * Set debian-branch = jessie-backports + * Revert "ltmain-as-needed.diff: Refresh" - jessie has old one + + -- Julian Andres Klode Wed, 01 Jun 2016 19:27:05 +0200 + +dh-autoreconf (12) unstable; urgency=medium + + [ Julian Andres Klode ] + * dh_autoreconf: --sourcedirectory is forwarded by dh(1) + Thanks to Niels Thykier for reporting this on IRC + * debian/control: Standards-Version: 3.9.7 + + [ Niels Thykier ] + * dh_autoreconf: Do nothing if there are no configure scripts + + -- Julian Andres Klode Sat, 02 Apr 2016 23:44:09 +0200 + +dh-autoreconf (11) unstable; urgency=medium + + * dh_autoreconf: Support --sourcedirectory in compat level 10 + (Closes: #673254) + * Also look for ltmain.sh in paths from libtool 2.46 (Closes: #814063) + * ltmain-as-needed.diff: Refresh + + -- Julian Andres Klode Mon, 08 Feb 2016 11:13:42 +0100 + dh-autoreconf (10) unstable; urgency=medium [ Julian Andres Klode ] diff -Nru dh-autoreconf-10/debian/control dh-autoreconf-12~bpo8+1~vivid/debian/control --- dh-autoreconf-10/debian/control 2014-09-25 13:40:48.000000000 +0000 +++ dh-autoreconf-12~bpo8+1~vivid/debian/control 2016-06-01 17:27:08.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Julian Andres Klode Build-Depends: debhelper (>= 9) -Standards-Version: 3.9.5 +Standards-Version: 3.9.7 Vcs-Git: git://anonscm.debian.org/collab-maint/dh-autoreconf.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/dh-autoreconf.git diff -Nru dh-autoreconf-10/debian/gbp.conf dh-autoreconf-12~bpo8+1~vivid/debian/gbp.conf --- dh-autoreconf-10/debian/gbp.conf 2014-09-25 13:40:48.000000000 +0000 +++ dh-autoreconf-12~bpo8+1~vivid/debian/gbp.conf 2016-06-01 17:27:08.000000000 +0000 @@ -2,3 +2,4 @@ debian-tag = %(version)s sign-tags = True multimaint-merge = True +debian-branch = jessie-backports diff -Nru dh-autoreconf-10/dh_autoreconf dh-autoreconf-12~bpo8+1~vivid/dh_autoreconf --- dh-autoreconf-10/dh_autoreconf 2014-09-25 13:40:48.000000000 +0000 +++ dh-autoreconf-12~bpo8+1~vivid/dh_autoreconf 2016-06-01 17:27:08.000000000 +0000 @@ -8,6 +8,7 @@ use strict; use Debian::Debhelper::Dh_Lib; +use Cwd; =head1 SYNOPSIS @@ -66,6 +67,11 @@ not prevent LIBTOOLIZE from running with this, as it only works correctly with libtoolize running. +=item B<-D>I B<--sourcedirectory>=I + +Run everything in the source directory. Supported only in debhelper compat +level 10 for backwards compatibility. + =item I B<--> I Run the program given by I with the arguments given by I @@ -89,7 +95,11 @@ =cut +my $opt_sourcedir; + init(options => { "mode=s" => \$dh{MODE}, + "D=s" => \$opt_sourcedir, + "sourcedirectory=s" => \$opt_sourcedir, "as-needed" => \$dh{AS_NEEDED}}); my $exception; @@ -105,13 +115,26 @@ $find_options .= "! \\( $dh{EXCLUDE_FIND} \\) -a "; } +# Find ltmain.sh +my $LTMAIN = "/usr/share/libtool/build-aux/ltmain.sh"; +$LTMAIN = "/usr/share/libtool/config/ltmain.sh" if (! -e "$LTMAIN"); + if ($dh{AS_NEEDED}) { - $find_options = "/usr/share/libtool/config/ltmain.sh . " . $find_options; + $find_options = "$LTMAIN . " . $find_options; } if (-e "debian/autoreconf") { @directories=filearray("debian/autoreconf", "."); $find_options = join(" ",@directories)." ".$find_options; +} elsif (not @ARGV) { + # No debian/autoreconf and no arguments - perhaps there is nothing + # to do. + my $dir = '.'; + $dir = $opt_sourcedir if defined($opt_sourcedir); + if (not -f "${dir}/configure.ac" and not -f "${dir}/configure.in") { + # Nothing to do, exit early. + exit(0); + } } if (-e "debian/autoreconf.before" || -e "debian/autoreconf.after") { @@ -130,7 +153,12 @@ eval { # Run autoreconf to recreate the needed files. + my $pwd = getcwd(); + chdir $opt_sourcedir if (defined($opt_sourcedir) && !compat(9)); + @ARGV ? doit(@ARGV, @{$dh{U_PARAMS}}) : doit('autoreconf', '-f', '-i', @directories); + + chdir $pwd; 1; } or do { $exception = $@; @@ -148,7 +176,7 @@ while() { chomp($_); my ($checksum, $filename) = split; - if ($filename eq "/usr/share/libtool/config/ltmain.sh") { + if ($filename eq "$LTMAIN") { $ltcheck = $checksum; } elsif ($filename =~ m/\/ltmain.sh$/ and $checksum eq $ltcheck) { doit("patch", "-f", "--no-backup-if-mismatch", "-i", diff -Nru dh-autoreconf-10/dh_autoreconf_clean dh-autoreconf-12~bpo8+1~vivid/dh_autoreconf_clean --- dh-autoreconf-10/dh_autoreconf_clean 2014-09-25 13:40:48.000000000 +0000 +++ dh-autoreconf-12~bpo8+1~vivid/dh_autoreconf_clean 2016-06-01 17:27:08.000000000 +0000 @@ -57,7 +57,9 @@ chomp($_); my ($checksum, $filename) = split(' ', $_, 2); - if ($filename eq "/usr/share/libtool/config/ltmain.sh") { + if ($filename eq "/usr/share/libtool/build-aux/ltmain.sh") { + $ltcheck = $checksum; + } elsif ($filename eq "/usr/share/libtool/config/ltmain.sh") { $ltcheck = $checksum; } elsif (!defined($file{$filename}) || $file{$filename} ne $checksum) { # Remove non-excluded, changed files