Package: dh-autoreconf Version: 6 Severity: important Dear Maintainer,
While preparing NMU for gnome-themes-standard (#661471), I find the package fails to build twice in a row, with the following message in the second round: ---8<--- dpkg-source: info: local changes detected, the modified files are: gnome-themes-standard-3.4.2/config.guess gnome-themes-standard-3.4.2/config.sub dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/gnome-themes-standard_3.4.2-1.1.diff.XGhYQM dpkg-source: info: you can integrate the local changes with dpkg-source --commit ---8<--- Checking the build log of the first round, I find two efforts to update config.{guess,sub}, one by dh_autoreconf from autoreconf.mk, and the other from CDBS buildcore.mk, trying to copy config.{guess,sub} directly from autotools-dev with backups: ---8<--- debian/rules build test -x debian/rules dh_autoreconf libtoolize: putting auxiliary files in `.'. libtoolize: copying file `./ltmain.sh' libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am. configure.ac:15: installing `./compile' src/Makefile.am: installing `./depcomp' mkdir -p "." WARNING: copyright-check disabled - touch debian/copyright_hints to enable. touch debian/stamp-copyright-check touch debian/stamp-upstream-cruft if test -e /usr/share/misc/config.guess ; then \ for i in ./config.guess ; do \ if ! test -e $i.cdbs-orig ; then \ mv $i $i.cdbs-orig ; \ cp --remove-destination /usr/share/misc/config.guess $i ; \ fi ; \ done ; \ fi if test -e /usr/share/misc/config.sub ; then \ for i in ./config.sub ; do \ if ! test -e $i.cdbs-orig ; then \ mv $i $i.cdbs-orig ; \ cp --remove-destination /usr/share/misc/config.sub $i ; \ fi ; \ done ; \ fi touch debian/stamp-autotools-files ---8<--- dh_autoreconf seems to take precedence. So, no matter how buildcore.mk tries to back up the files, it backs up the updated contents. The debian/rules of gnome-themes-standard is like this: ---8<--- #!/usr/bin/make -f include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/rules/debhelper.mk ... ---8<--- As autoreconf.mk is included first, it takes precedence over buildcore.mk for "post-patches" and "reverse-config" targets. If I insert an include statement for buildcore.mk before it, the problem will be fixed. However, I think it's better to add the include line in autoreconf.mk, so that all CDBS packages should be similarly fixed at once. Regards, -- Theppitak Karoonboonyanan http://linux.thai.net/~thep/ -- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 3.2.0-3-amd64 (SMP w/4 CPU cores) Locale: LANG=th_TH.utf8, LC_CTYPE=th_TH.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages dh-autoreconf depends on: ii autoconf 2.69-1 ii automake [automaken] 1:1.11.5-2 ii debhelper 9.20120608 ii libtool 2.4.2-1.1 ii perl 5.14.2-12 Versions of packages dh-autoreconf recommends: ii autopoint 0.18.1.1-9 dh-autoreconf suggests no packages. -- no debconf information -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org