diff -Nru dh-autoreconf-6/autoreconf.mk dh-autoreconf-2~lucid1~ppa1/autoreconf.mk --- dh-autoreconf-6/autoreconf.mk 2012-02-23 14:46:47.000000000 +0000 +++ dh-autoreconf-2~lucid1~ppa1/autoreconf.mk 2010-07-23 11:25:07.000000000 +0000 @@ -1,12 +1,7 @@ # autoreconf.mk - dh-autoreconf integration for CDBS. -CDBS_BUILD_DEPENDS_rules_autoreconf := dh-autoreconf -CDBS_BUILD_DEPENDS += , $(CDBS_BUILD_DEPENDS_rules_autoreconf) - -post-patches:: debian/autoreconf.after - -debian/autoreconf.after: +post-patches:: dh_autoreconf $(DEB_DH_AUTORECONF_ARGS) -reverse-config:: +clean:: dh_autoreconf_clean $(DEB_DH_AUTORECONF_CLEAN_ARGS) diff -Nru dh-autoreconf-6/debian/changelog dh-autoreconf-2~lucid1~ppa1/debian/changelog --- dh-autoreconf-6/debian/changelog 2012-02-23 14:46:47.000000000 +0000 +++ dh-autoreconf-2~lucid1~ppa1/debian/changelog 2012-06-27 15:41:26.000000000 +0000 @@ -1,49 +1,14 @@ -dh-autoreconf (6) unstable; urgency=low +dh-autoreconf (2~lucid1~ppa1) lucid; urgency=low - * Require at least version 2.4.2 of libtool (Closes: #655876) - * Add Multi-Arch: foreign field (Closes: #658969) - * Do not allow to run dh_autoreconf twice (Closes: #630766) - * dh_autoreconf: Create autoreconf.after even if autoreconf fails - * Increase Standards-Version to 3.9.3, use copyright-format 1.0 + * Upload to PPA - -- Julian Andres Klode Thu, 23 Feb 2012 15:46:34 +0100 + -- Chow Loong Jin Wed, 27 Jun 2012 23:41:26 +0800 -dh-autoreconf (5) unstable; urgency=low +dh-autoreconf (2~lucid1) lucid-backports; urgency=low - * ltmain-as-needed.diff: Rebase against libtool 2.4.2 (Closes: #647070) + * Automated backport upload; no source changes. - -- Julian Andres Klode Sun, 30 Oct 2011 14:36:09 +0100 - -dh-autoreconf (4) unstable; urgency=low - - [ Julian Andres Klode ] - * autoreconf.mk: Run _clean in reverse-config (Closes: #596099) - * dh_autoreconf: Add --as-needed for automatic patching of ltmain.sh - * debian/control: Increase Standards-Version to 3.9.2 - - [ Ari Pollak ] - * dh_autoreconf: support parameters passed to custom program (Closes: #623229) - - -- Julian Andres Klode Tue, 14 Jun 2011 19:32:29 +0200 - -dh-autoreconf (3) unstable; urgency=low - - [ Cyril Brulebois ] - * dh-autoreconf.pod: Update rules example for debhelper 8 (Closes: #611414) - - [ Julian Andres Klode ] - * autoreconf.mk: Run dh_autoreconf only once (Closes: #618580) - * Make it possible to run on sub directories only (Closes: #582114) - * autoreconf.mk: Add to CDBS_BUILD_DEPENDS (Closes: #610163) - * autoreconf.mk: Run dh_autoreconf_clean before clean (Closes: #596099) - * debian/control: Set Standards-Version to 3.9.1 - * dh_autoreconf: Ignore common VCS directories (Closes: #611864) - * dh_autoreconf_clean: Remove 'before' file even if autoreconf failed - - [ Marcin Owsiany ] - * dh-autoreconf.pod: Document conflict with autotools-dev (Closes: #587102) - - -- Julian Andres Klode Mon, 04 Apr 2011 16:06:13 +0200 + -- Scott Kitterman Sat, 09 Apr 2011 23:58:20 +0000 dh-autoreconf (2) unstable; urgency=low diff -Nru dh-autoreconf-6/debian/control dh-autoreconf-2~lucid1~ppa1/debian/control --- dh-autoreconf-6/debian/control 2012-02-23 14:46:47.000000000 +0000 +++ dh-autoreconf-2~lucid1~ppa1/debian/control 2010-07-23 11:25:07.000000000 +0000 @@ -3,15 +3,14 @@ Priority: optional Maintainer: Julian Andres Klode Build-Depends: debhelper (>= 7.0.50~) -Standards-Version: 3.9.3 +Standards-Version: 3.9.0 Vcs-Git: git://git.debian.org/collab-maint/dh-autoreconf.git Vcs-Browser: http://git.debian.org/?p=collab-maint/dh-autoreconf.git Package: dh-autoreconf Architecture: all -Multi-Arch: foreign Depends: ${perl:Depends}, ${misc:Depends}, debhelper, autoconf, - automake | automaken, libtool (>= 2.4.2) + automake | automaken, libtool Enhances: debhelper, cdbs Recommends: autopoint Description: debhelper add-on to call autoreconf and clean up after the build diff -Nru dh-autoreconf-6/debian/copyright dh-autoreconf-2~lucid1~ppa1/debian/copyright --- dh-autoreconf-6/debian/copyright 2012-02-23 14:46:47.000000000 +0000 +++ dh-autoreconf-2~lucid1~ppa1/debian/copyright 2010-07-23 11:25:07.000000000 +0000 @@ -1,7 +1,5 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ - Files: * -Copyright: © 2010-2012 Julian Andres Klode +Copyright: © 2010 Julian Andres Klode License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -Nru dh-autoreconf-6/debian/install dh-autoreconf-2~lucid1~ppa1/debian/install --- dh-autoreconf-6/debian/install 2012-02-23 14:46:47.000000000 +0000 +++ dh-autoreconf-2~lucid1~ppa1/debian/install 2010-07-23 11:25:07.000000000 +0000 @@ -2,4 +2,3 @@ dh_autoreconf_clean usr/bin autoreconf.pm /usr/share/perl5/Debian/Debhelper/Sequence autoreconf.mk /usr/share/cdbs/1/rules -ltmain-as-needed.diff /usr/share/dh-autoreconf diff -Nru dh-autoreconf-6/debian/NEWS dh-autoreconf-2~lucid1~ppa1/debian/NEWS --- dh-autoreconf-6/debian/NEWS 2012-02-23 14:46:47.000000000 +0000 +++ dh-autoreconf-2~lucid1~ppa1/debian/NEWS 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -dh-autoreconf (4) unstable; urgency=low - - dh_autoreconf now supports automatic patching of ltmain.sh files - for adding -Wl,--as-needed support to them. See the manual pages - dh-autoreconf(7) and dh_autoreconf(1) for more information. - - -- Julian Andres Klode Tue, 14 Jun 2011 19:32:29 +0200 diff -Nru dh-autoreconf-6/dh_autoreconf dh-autoreconf-2~lucid1~ppa1/dh_autoreconf --- dh-autoreconf-6/dh_autoreconf 2012-02-23 14:46:47.000000000 +0000 +++ dh-autoreconf-2~lucid1~ppa1/dh_autoreconf 2010-07-23 11:25:07.000000000 +0000 @@ -21,23 +21,6 @@ of all files before/after the build. It is complemented by dh_autoreconf_clean which creates a list of all changed and added files and removes them. -Please note that dh_autoreconf can only be run once. Thus, if you need to -run multiple commands, use a script or similar. An example is given in -L. - -=head1 FILES - -=over 4 - -=item debian/autoreconf - -This file can contain a list of directories. If present, dh_autoreconf will -only scan the given directories for changes. If no special command is given -to dh_autoreconf, it will also forward the directory list to autoreconf -which causes it to be run only on those sub directories. - -=back - =head1 OPTIONS =over 4 @@ -49,23 +32,12 @@ C even if there are changes. You may use this option multiple times to build up a list of things to exclude. -Starting with version 3, the directories of common version control systems -such as cvs, git, hg, svn, and bzr are excluded automatically. - =item B<--mode=>I Change the way in which modifications to files are detected. The default mode is I for using MD5 checksums, but there is also I for using the time of the last modification and the file size. -=item B<--as-needed> - -Enable support for -Wl,--as-needed in all ltmain.sh files identical to -the one of the libtool package. This only works in the MD5 mode (the -default one). The changes are reverted in dh_autoreconf_clean. You should -not prevent LIBTOOLIZE from running with this, as it only works correctly -with libtoolize running. - =item I B<--> I Run the program given by I with the arguments given by I @@ -87,35 +59,14 @@ export AUTOMAKE = automake1.10 export LIBTOOLIZE = true + =cut -init(options => { "mode=s" => \$dh{MODE}, - "as-needed" => \$dh{AS_NEEDED}}); +init(options => { "mode=s" => \$dh{MODE}}); -my $exception; -my @directories; my $find_options='! -ipath "./debian/*" -a '; -my @exclude_default = ("'*/.git/*'", "'*/.hg/*'", "'*/.bzr/*'", "'*/.svn/*'", - "'*/CVS/*'"); - -$find_options .= ("! \\( -path " . join(" -o -path ", @exclude_default) . - " \\) -a "); - if (defined($dh{EXCLUDE_FIND}) && $dh{EXCLUDE_FIND} ne '') { - $find_options .= "! \\( $dh{EXCLUDE_FIND} \\) -a "; -} - -if ($dh{AS_NEEDED}) { - $find_options = "/usr/share/libtool/config/ltmain.sh . " . $find_options; -} - -if (-e "debian/autoreconf") { - @directories=filearray("debian/autoreconf", "."); - $find_options = join(" ",@directories)." ".$find_options; -} - -if (-e "debian/autoreconf.before" || -e "debian/autoreconf.after") { - error("Can only be run once, see dh-autoreconf(7)"); + $find_options .= "! \\( $dh{EXCLUDE_FIND} \\) -a"; } my %modes = ( @@ -128,37 +79,11 @@ complex_doit("$find > debian/autoreconf.before"); -eval { - # Run autoreconf to recreate the needed files. - @ARGV ? doit(@ARGV, @{$dh{U_PARAMS}}) : doit('autoreconf', '-f', '-i', @directories); - 1; -} or do { - $exception = $@; -}; +# Run autoreconf to recreate the needed files. +@ARGV ? doit(@ARGV) : doit('autoreconf', '-f', '-i'); complex_doit("$find > debian/autoreconf.after"); -# Let's fail here if autoreconf failed. -die $exception if (defined $exception); - -# Fix ltmain.sh to support -Wl,--as-needed -if ($dh{AS_NEEDED}) { - open(FILE, 'debian/autoreconf.after') or die($!); - my $ltcheck = ""; - while() { - chomp($_); - my ($checksum, $filename) = split; - if ($filename eq "/usr/share/libtool/config/ltmain.sh") { - $ltcheck = $checksum; - } elsif ($filename =~ m/\/ltmain.sh$/ and $checksum eq $ltcheck) { - doit("patch", "-f", "--no-backup-if-mismatch", "-i", - "/usr/share/dh-autoreconf/ltmain-as-needed.diff", - $filename); - } - } - close(FILE); -} - =head1 SEE ALSO L, L, L diff -Nru dh-autoreconf-6/dh_autoreconf_clean dh-autoreconf-2~lucid1~ppa1/dh_autoreconf_clean --- dh-autoreconf-6/dh_autoreconf_clean 2012-02-23 14:46:47.000000000 +0000 +++ dh-autoreconf-2~lucid1~ppa1/dh_autoreconf_clean 2010-07-23 11:25:07.000000000 +0000 @@ -16,19 +16,12 @@ =head1 DESCRIPTION dh_autoreconf_clean removes all files which have been created or changed -during the autoreconf call executed by L. It also reverts -any ltmain.sh patch applied by dh_autoreconf. +during the autoreconf call executed by L. =cut init(); -# autoreconf failed, just remove the 'before' file. -if (-r 'debian/autoreconf.before' && ! -r 'debian/autoreconf.after') { - doit("rm", "debian/autoreconf.before"); - exit 0; -} - if (! -r 'debian/autoreconf.before' || ! -r 'debian/autoreconf.after') { exit 0; } @@ -53,22 +46,13 @@ # Read the new files open(FILE, 'debian/autoreconf.after') or die($!); -my $ltcheck = ""; while() { chomp($_); my ($checksum, $filename) = split; - - if ($filename eq "/usr/share/libtool/config/ltmain.sh") { - $ltcheck = $checksum; - } elsif (!defined($file{$filename}) || $file{$filename} ne $checksum) { - # Remove non-excluded, changed files - push @delete, $filename; - } elsif ($checksum eq $ltcheck) { - # A valid ltmain.sh, reverse patch - doit("patch", "-R", "-f", "--no-backup-if-mismatch", "-i", - "/usr/share/dh-autoreconf/ltmain-as-needed.diff", - $filename); - } + # Mark file for deletion if its new or if it has changed and only if it is + # not excluded and not inside debian/. + push @delete, $filename if (!defined($file{$filename}) || + $file{$filename} ne $checksum); } close(FILE); diff -Nru dh-autoreconf-6/dh-autoreconf.pod dh-autoreconf-2~lucid1~ppa1/dh-autoreconf.pod --- dh-autoreconf-6/dh-autoreconf.pod 2012-02-23 14:46:47.000000000 +0000 +++ dh-autoreconf-2~lucid1~ppa1/dh-autoreconf.pod 2010-07-23 11:25:07.000000000 +0000 @@ -9,7 +9,7 @@ #!/usr/bin/make -f %: - dh $@ --with autoreconf + dh --with autoreconf $@ This will call dh_autoreconf prior to dh_auto_configure and will call dh_autoreconf_clean before dh_clean. @@ -26,55 +26,6 @@ C to pass arguments to dh_autoreconf_clean. See their manual pages for information on available arguments. -=head1 TIPS AND EXAMPLES - -=head2 PATCHING LTMAIN.SH FOR AS-NEEDED LINKER FLAGS - -You can add support for -Wl,--as-needed to ltmain.sh (at least for those -ltmain.sh scripts changed during autoreconf) by passing the argument -B<--as-needed> to dh_autoreconf, as demonstrated in the following example: - - #!/usr/bin/make -f - %: - dh $@ --with autoreconf - override_dh_autoreconf: - dh_autoreconf --as-needed - -and for CDBS, by adding it to the correct variable such as: - - DEB_DH_AUTORECONF_ARGS = --as-needed - -For more information about this feature, see L - -=head2 RUNNING MULTIPLE COMMANDS WITH DH_AUTORECONF - -Please note that you may run dh_autoreconf only once. If you need to run -multiple commands, you can put the commands into a script or your debian/rules -file and then pass the name of your script to dh_autoreconf. For example, if -your script is called debian/autogen.sh, you can put the following into your -debian/rules if you use dh: - - override_dh_autoreconf: - dh_autoreconf debian/autogen.sh - -Or, if you use CDBS: - - DEB_DH_AUTORECONF_ARGS += debian/autogen.sh - -=head1 CAVEATS - -dh_autoreconf is a superset of the autotools-dev debhelper addons, so -you do not need --with=autotools_dev if you use --with=autoreconf. In -fact, in most cases they should not be used together, as it may lead to -unpredictable behaviour. - -From time to time, there might be a short breakage for those using -automatic ltmain.sh patching, when the patch now longer applies to -the ltmain.sh. - -You can only run dh_autoreconf once. Future versions may be able to -be run multiple times, but this requires slightly more planning. - =head1 SEE ALSO L, L, L, L diff -Nru dh-autoreconf-6/ltmain-as-needed.diff dh-autoreconf-2~lucid1~ppa1/ltmain-as-needed.diff --- dh-autoreconf-6/ltmain-as-needed.diff 2012-02-23 14:46:47.000000000 +0000 +++ dh-autoreconf-2~lucid1~ppa1/ltmain-as-needed.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -Bug-Debian: http://bugs.debian.org/347650 -Last-Update: 2011-06-14 - ---- a/ltmain.sh -+++ b/ltmain.sh -@@ -5800,6 +5800,11 @@ func_mode_link () - arg=$func_stripname_result - ;; - -+ -Wl,--as-needed|-Wl,--no-as-needed) -+ deplibs="$deplibs $arg" -+ continue -+ ;; -+ - -Wl,*) - func_stripname '-Wl,' '' "$arg" - args=$func_stripname_result -@@ -6163,6 +6168,15 @@ func_mode_link () - lib= - found=no - case $deplib in -+ -Wl,--as-needed|-Wl,--no-as-needed) -+ if test "$linkmode,$pass" = "prog,link"; then -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ deplibs="$deplib $deplibs" -+ fi -+ continue -+ ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then