Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dh-autoreconf for openSUSE:Factory checked in at 2021-03-16 15:45:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dh-autoreconf (Old) and /work/SRC/openSUSE:Factory/.dh-autoreconf.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dh-autoreconf" Tue Mar 16 15:45:31 2021 rev:6 rq:879219 version:19 Changes: -------- --- /work/SRC/openSUSE:Factory/dh-autoreconf/dh-autoreconf.changes 2015-01-14 11:45:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dh-autoreconf.new.2401/dh-autoreconf.changes 2021-03-16 15:46:37.821249754 +0100 @@ -1,0 +2,32 @@ +Sun Aug 16 13:16:42 UTC 2020 - Dirk Mueller <[email protected]> + +- update to 19: + * Disable gtkdocize for now (Closes: #898916) + * Correctly restore working directory if autoreconf failed (Closes: #876187) + * Automatically use xdg-autogen if configure.{ac,in} contain XDT_ lines. + Thanks to Unit 193 for the initial patch (Closes: #893746) + * Automatically handle gtkdocize if no custom command has been provided + (Closes: #640376) + * Add Breaks: quilt (<< 0.63-8.2~), dpatch (<< 2.0.38+nmu1~) (Closes: #889567) + * Move to Salsa + * Use debhelper compat level 11 + * Bump Standards-Version to 4.1.3 + * debian/copyright: Point to HTTPS Format url + * d/rules: Use /usr/share/dpkg/pkg-info.mk instead of dpkg-parsechangelog + * Do not fail, only warn, if run multiple times (Closes: #887482) + * Also clean up symlinks (Closes: #882479) + * Run dh_autoreconf after dh_update_autotools_config, + not before dh_auto_configure + * update dh-autoreconf(7) man page (Closes: #870518) + * dh_autoreconf_clean: Add a NOOP promise (Closes: #881394) + * dh-autoreconf can build without (fake)root + * Bump Standards-Version to 4.1.1 + * Drop alternative dependency on automaken (Closes: #857556) + * Speed-up: Use -exec ... + instead of -exec ... \; for find. + Thanks to Helmut Grohne and Tollef Fog Heen for the suggestion + * Update Standards-Version and point Vcs fields to https + * dh_autoreconf: --sourcedirectory is forwarded by dh(1) + Thanks to Niels Thykier for reporting this on IRC + * dh_autoreconf: Do nothing if there are no configure scripts + +------------------------------------------------------------------- Old: ---- dh-autoreconf_10.tar.xz New: ---- dh-autoreconf_19.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dh-autoreconf.spec ++++++ --- /var/tmp/diff_new_pack.aUMnMp/_old 2021-03-16 15:46:38.453250735 +0100 +++ /var/tmp/diff_new_pack.aUMnMp/_new 2021-03-16 15:46:38.457250741 +0100 @@ -1,7 +1,7 @@ # # spec file for package dh-autoreconf # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,17 +12,17 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: dh-autoreconf -Version: 10 +Version: 19 Release: 0 Summary: Add-on for debhelper to call autoreconf and clean up after the build -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Packages -Url: http://www.debian.org +URL: http://www.debian.org Source0: http://ftp.de.debian.org/debian/pool/main/d/dh-autoreconf/%{name}_%{version}.tar.xz BuildRequires: debhelper BuildRequires: xz ++++++ dh-autoreconf_10.tar.xz -> dh-autoreconf_19.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dh-autoreconf-10/autoreconf.pm new/dh-autoreconf-19/autoreconf.pm --- old/dh-autoreconf-10/autoreconf.pm 2014-09-25 15:40:48.000000000 +0200 +++ new/dh-autoreconf-19/autoreconf.pm 2018-05-19 21:33:40.000000000 +0200 @@ -3,7 +3,7 @@ use strict; use Debian::Debhelper::Dh_Lib; -insert_before("dh_auto_configure", "dh_autoreconf"); +insert_after("dh_update_autotools_config", "dh_autoreconf"); insert_before("dh_clean", "dh_autoreconf_clean"); 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dh-autoreconf-10/debian/changelog new/dh-autoreconf-19/debian/changelog --- old/dh-autoreconf-10/debian/changelog 2014-09-25 15:40:48.000000000 +0200 +++ new/dh-autoreconf-19/debian/changelog 2018-05-19 21:33:40.000000000 +0200 @@ -1,3 +1,88 @@ +dh-autoreconf (19) unstable; urgency=medium + + * Disable gtkdocize for now (Closes: #898916) + + -- Julian Andres Klode <[email protected]> Sat, 19 May 2018 21:33:40 +0200 + +dh-autoreconf (18) unstable; urgency=medium + + * Correctly restore working directory if autoreconf failed (Closes: #876187) + * Automatically use xdg-autogen if configure.{ac,in} contain XDT_ lines. + Thanks to Unit 193 for the initial patch (Closes: #893746) + * Automatically handle gtkdocize if no custom command has been provided + (Closes: #640376) + + -- Julian Andres Klode <[email protected]> Tue, 15 May 2018 19:31:30 +0000 + +dh-autoreconf (17) unstable; urgency=medium + + * Add Breaks: quilt (<< 0.63-8.2~), dpatch (<< 2.0.38+nmu1~) (Closes: #889567) + * Move to Salsa + * Use debhelper compat level 11 + * Bump Standards-Version to 4.1.3 + * debian/copyright: Point to HTTPS Format url + * d/rules: Use /usr/share/dpkg/pkg-info.mk instead of dpkg-parsechangelog + + -- Julian Andres Klode <[email protected]> Wed, 21 Mar 2018 23:43:37 +0100 + +dh-autoreconf (16) unstable; urgency=medium + + * Do not fail, only warn, if run multiple times (Closes: #887482) + * Also clean up symlinks (Closes: #882479) + * Run dh_autoreconf after dh_update_autotools_config, + not before dh_auto_configure + + -- Julian Andres Klode <[email protected]> Wed, 24 Jan 2018 22:26:43 +0100 + +dh-autoreconf (15) unstable; urgency=medium + + [ Lukas Schwaighofer ] + * update dh-autoreconf(7) man page (Closes: #870518) + + [ Niels Thykier ] + * dh_autoreconf_clean: Add a NOOP promise (Closes: #881394) + * dh-autoreconf can build without (fake)root + + [ Julian Andres Klode ] + * Bump Standards-Version to 4.1.1 + + -- Julian Andres Klode <[email protected]> Sat, 11 Nov 2017 22:47:52 +0100 + +dh-autoreconf (14) unstable; urgency=medium + + * Drop alternative dependency on automaken (Closes: #857556) + + -- Julian Andres Klode <[email protected]> Fri, 31 Mar 2017 18:13:10 +0200 + +dh-autoreconf (13) unstable; urgency=medium + + * Speed-up: Use -exec ... + instead of -exec ... \; for find. + Thanks to Helmut Grohne and Tollef Fog Heen for the suggestion + * Update Standards-Version and point Vcs fields to https + + -- Julian Andres Klode <[email protected]> Fri, 06 Jan 2017 20:52:54 +0100 + +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 <[email protected]> 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 <[email protected]> Mon, 08 Feb 2016 11:13:42 +0100 + dh-autoreconf (10) unstable; urgency=medium [ Julian Andres Klode ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dh-autoreconf-10/debian/compat new/dh-autoreconf-19/debian/compat --- old/dh-autoreconf-10/debian/compat 2014-09-25 15:40:48.000000000 +0200 +++ new/dh-autoreconf-19/debian/compat 2018-05-19 21:33:40.000000000 +0200 @@ -1 +1 @@ -9 +11 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dh-autoreconf-10/debian/control new/dh-autoreconf-19/debian/control --- old/dh-autoreconf-10/debian/control 2014-09-25 15:40:48.000000000 +0200 +++ new/dh-autoreconf-19/debian/control 2018-05-19 21:33:40.000000000 +0200 @@ -2,16 +2,18 @@ Section: devel Priority: optional Maintainer: Julian Andres Klode <[email protected]> -Build-Depends: debhelper (>= 9) -Standards-Version: 3.9.5 -Vcs-Git: git://anonscm.debian.org/collab-maint/dh-autoreconf.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/dh-autoreconf.git +Build-Depends: debhelper (>= 11) +Standards-Version: 4.1.3 +Rules-Requires-Root: no +Vcs-Git: https://salsa.debian.org/debian/dh-autoreconf.git +Vcs-Browser: https://salsa.debian.org/debian/dh-autoreconf Package: dh-autoreconf Architecture: all Multi-Arch: foreign Depends: ${perl:Depends}, ${misc:Depends}, debhelper, autoconf, - automake | automaken, autopoint, libtool (>= 2.4.2) + automake, autopoint, libtool (>= 2.4.2) +Breaks: quilt (<< 0.63-8.2~), dpatch (<< 2.0.38+nmu1~) Enhances: debhelper, cdbs Description: debhelper add-on to call autoreconf and clean up after the build dh-autoreconf provides a debhelper sequence addon named 'autoreconf' and two diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dh-autoreconf-10/debian/copyright new/dh-autoreconf-19/debian/copyright --- old/dh-autoreconf-10/debian/copyright 2014-09-25 15:40:48.000000000 +0200 +++ new/dh-autoreconf-19/debian/copyright 2018-05-19 21:33:40.000000000 +0200 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Files: * Copyright: ?? 2010-2014 Julian Andres Klode <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dh-autoreconf-10/debian/rules new/dh-autoreconf-19/debian/rules --- old/dh-autoreconf-10/debian/rules 2014-09-25 15:40:48.000000000 +0200 +++ new/dh-autoreconf-19/debian/rules 2018-05-19 21:33:40.000000000 +0200 @@ -1,6 +1,6 @@ #!/usr/bin/make -f -version := $(shell dpkg-parsechangelog | sed -nr 's/^Version: (.*)/\1/p') -pod2man := pod2man -r "dh-autoreconf v$(version)" -c dh-autoreconf +include /usr/share/dpkg/pkg-info.mk +pod2man := pod2man -r "dh-autoreconf v$(DEB_VERSION)" -c dh-autoreconf %: dh $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dh-autoreconf-10/dh-autoreconf.pod new/dh-autoreconf-19/dh-autoreconf.pod --- old/dh-autoreconf-10/dh-autoreconf.pod 2014-09-25 15:40:48.000000000 +0200 +++ new/dh-autoreconf-19/dh-autoreconf.pod 2018-05-19 21:33:40.000000000 +0200 @@ -4,8 +4,9 @@ =head1 DESCRIPTION -The dh-autoreconf package provides a sequence addon for debhelper 7 which -can be used in the following way: +The dh-autoreconf package provides a sequence addon for debhelper 7 and is +enabled by default since compatibility level 10. For earlier compatibility +levels it can be enabled in the following way: #!/usr/bin/make -f %: @@ -34,9 +35,6 @@ 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 @@ -63,10 +61,11 @@ =head1 CAVEATS -dh_autoreconf is mostly a superset of the autotools-dev debhelper addons, so -you do not need --with=autotools_dev if you use --with=autoreconf, as long -as your autoreconf updates the config.guess and config.sub files. If it does -not, feel free to use both together. +dh_autoreconf is mostly a superset of the dh_update_autotools_config debhelper +command included in debhelper since version 9.20160115. When using the dh +sequencer, dh_update_autotools_config is run before dh_autoreconf and updates +the config.guess and config.sub files. This is required in cases where +autoreconf does not update config.guess and config.sub itself. From time to time, there might be a short breakage for those using automatic ltmain.sh patching, when the patch no longer applies to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dh-autoreconf-10/dh_autoreconf new/dh-autoreconf-19/dh_autoreconf --- old/dh-autoreconf-10/dh_autoreconf 2014-09-25 15:40:48.000000000 +0200 +++ new/dh-autoreconf-19/dh_autoreconf 2018-05-19 21:33:40.000000000 +0200 @@ -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<dir> B<--sourcedirectory>=I<dir> + +Run everything in the source directory. Supported only in debhelper compat +level 10 for backwards compatibility. + =item I<program> B<--> I<params> Run the program given by I<program> with the arguments given by I<params> @@ -89,7 +95,20 @@ =cut +# Check if a configure line matches a certain regular expression +sub grep_configure { + my $expr = shift; + foreach my $configure (("configure.ac", "configure.in")) { + return eval { doit("grep", "-q", $expr, $configure) } if (-e $configure); + } + return 0; +} + +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,22 +124,36 @@ $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") { - error("Can only be run once, see dh-autoreconf(7)"); + warning("Only runs once, see dh-autoreconf(7)"); + exit(0); } my %modes = ( - 'md5' => "find $find_options -type f -exec md5sum {} \\;", - 'timesize' => "find $find_options -type f -printf \"%s|%T@ %p\n\"" + 'md5' => "find $find_options -type f -exec md5sum {} + -o -type l -printf \"symlink %p\n\"", + 'timesize' => "find $find_options -type f -printf \"%s|%T@ %p\n\" -o -type l -printf \"symlink %p\n\"" ); my $find = $modes{$dh{MODE} || "md5"} || @@ -128,14 +161,31 @@ complex_doit("$find > debian/autoreconf.before"); +my $pwd = getcwd(); + eval { # Run autoreconf to recreate the needed files. - @ARGV ? doit(@ARGV, @{$dh{U_PARAMS}}) : doit('autoreconf', '-f', '-i', @directories); + chdir $opt_sourcedir if (defined($opt_sourcedir) && !compat(9)); + + if (@ARGV) { + doit(@ARGV, @{$dh{U_PARAMS}}) + } else { + #doit("gtkdocize", "--copy") if (grep_configure("^GTK_DOC_CHECK")); + + if (grep_configure("^XDT_")) { + $ENV{NOCONFIGURE}='1'; + doit('xdt-autogen', @directories); + } else { + doit('autoreconf', '-f', '-i', @directories); + } + } 1; } or do { $exception = $@; }; +chdir $pwd; + complex_doit("$find > debian/autoreconf.after"); # Let's fail here if autoreconf failed. @@ -148,7 +198,7 @@ while(<FILE>) { 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dh-autoreconf-10/dh_autoreconf_clean new/dh-autoreconf-19/dh_autoreconf_clean --- old/dh-autoreconf-10/dh_autoreconf_clean 2014-09-25 15:40:48.000000000 +0200 +++ new/dh-autoreconf-19/dh_autoreconf_clean 2018-05-19 21:33:40.000000000 +0200 @@ -23,6 +23,8 @@ init(); +# PROMISE: DH NOOP WITHOUT autoreconf.before autoreconf.after + # autoreconf failed, just remove the 'before' file. if (-r 'debian/autoreconf.before' && ! -r 'debian/autoreconf.after') { doit("rm", "debian/autoreconf.before"); @@ -57,7 +59,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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dh-autoreconf-10/ltmain-as-needed.diff new/dh-autoreconf-19/ltmain-as-needed.diff --- old/dh-autoreconf-10/ltmain-as-needed.diff 2014-09-25 15:40:48.000000000 +0200 +++ new/dh-autoreconf-19/ltmain-as-needed.diff 2018-05-19 21:33:40.000000000 +0200 @@ -3,7 +3,7 @@ --- a/ltmain.sh +++ b/ltmain.sh -@@ -5800,6 +5800,11 @@ func_mode_link () +@@ -7220,6 +7220,11 @@ func_mode_link () arg=$func_stripname_result ;; @@ -15,9 +15,9 @@ -Wl,*) func_stripname '-Wl,' '' "$arg" args=$func_stripname_result -@@ -6163,6 +6168,15 @@ func_mode_link () +@@ -7610,6 +7615,15 @@ func_mode_link () lib= - found=no + found=false case $deplib in + -Wl,--as-needed|-Wl,--no-as-needed) + if test "$linkmode,$pass" = "prog,link"; then @@ -30,4 +30,4 @@ + ;; -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then
