diff -Nru dh-buildinfo-0.11+nmu1/debian/changelog dh-buildinfo-0.11+nmu2/debian/changelog --- dh-buildinfo-0.11+nmu1/debian/changelog 2016-04-03 21:00:26.000000000 +0000 +++ dh-buildinfo-0.11+nmu2/debian/changelog 2018-01-10 21:28:27.000000000 +0000 @@ -1,3 +1,20 @@ +dh-buildinfo (0.11+nmu2) unstable; urgency=medium + + * Non-maintainer upload. + * Replace call to Dh_Lib::buildarch() with Dh_Lib::hostarch() to + avoid a deprecation warning. Thanks to Clint Adams for the + patch. (Closes: #882334) + * Replace manual uses of install(1) with debhelper's install_dir + and install_file. They are faster and support "Rules-Requires-Root" + out of the box. Thanks to Clint Adams for the patch. + (Closes: #881421) + * Add the (now) mandatory "build-arch" and "build-indep" targets + (plus add "install-arch" and "install-indep" for consistency). + * Set "Rules-Requires-Root: no" as dh-buildinfo does not require + (fake)root to build (after the above changes). + + -- Niels Thykier Wed, 10 Jan 2018 21:28:27 +0000 + dh-buildinfo (0.11+nmu1) unstable; urgency=medium * Non-maintainer upload. diff -Nru dh-buildinfo-0.11+nmu1/debian/control dh-buildinfo-0.11+nmu2/debian/control --- dh-buildinfo-0.11+nmu1/debian/control 2014-05-17 21:10:44.000000000 +0000 +++ dh-buildinfo-0.11+nmu2/debian/control 2018-01-10 21:00:16.000000000 +0000 @@ -4,6 +4,7 @@ Build-Depends-Indep: perl, build-essential (>= 7) Build-Depends: debhelper (>= 9) Maintainer: Yann Dirson +Rules-Requires-Root: no Standards-Version: 3.5.1 Package: dh-buildinfo diff -Nru dh-buildinfo-0.11+nmu1/debian/rules dh-buildinfo-0.11+nmu2/debian/rules --- dh-buildinfo-0.11+nmu1/debian/rules 2016-04-03 21:01:14.000000000 +0000 +++ dh-buildinfo-0.11+nmu2/debian/rules 2018-01-10 21:25:09.000000000 +0000 @@ -18,7 +18,7 @@ endif TMP =`pwd`/debian/$(PACKAGE) -build: build-stamp +build build-indep: build-stamp build-stamp: dh_testdir @@ -36,7 +36,8 @@ dh_clean -install: +install: install-indep +install-indep: build-indep dh_testdir dh_testroot dh_prep @@ -47,12 +48,9 @@ mv $(TMP)/usr/share/perl5/buildinfo.pm $(TMP)/usr/share/perl5/Debian/Debhelper/Sequence/ # not the tip of elegance but I don't know how to install this properly with Module::Build -# Build architecture-dependent files here. -binary-arch: build install -# We have nothing to do by default. # Build architecture-independent files here. -binary-indep: build install +binary-indep: install-indep dh_testdir dh_testroot dh_installdocs buildinfo.html @@ -72,4 +70,5 @@ @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary +# binary-arch, install-arch and build-arch are no-ops. +.PHONY: build clean binary-indep binary-arch binary build-arch install-arch diff -Nru dh-buildinfo-0.11+nmu1/dh_buildinfo dh-buildinfo-0.11+nmu2/dh_buildinfo --- dh-buildinfo-0.11+nmu1/dh_buildinfo 2014-05-17 21:15:03.000000000 +0000 +++ dh-buildinfo-0.11+nmu2/dh_buildinfo 2018-01-10 20:58:50.000000000 +0000 @@ -20,7 +20,7 @@ use Debian::Debhelper::Dh_Lib; use BuildDeps; -my $buildarch = Debian::Debhelper::Dh_Lib::buildarch(); +my $hostarch = Debian::Debhelper::Dh_Lib::hostarch(); =head1 SYNOPSIS @@ -78,7 +78,7 @@ next unless /^Status: .*ok installed$/m; # do not include foreign archs - next unless /^Architecture: ($buildarch|all)$/m; + next unless /^Architecture: ($hostarch|all)$/m; my ($package) = /^Package: (.*)$/m; push @{$providers{$package}}, $package; @@ -337,11 +337,11 @@ # If this is a symlink, leave it alone. if ( ! -d "$tmp/usr/share/doc/$package" && ! -l "$tmp/usr/share/doc/$package") { - doit("install","-g",0,"-o",0,"-d","$tmp/usr/share/doc/$package"); + install_dir("$tmp/usr/share/doc/$package"); } if ( ! -l "$tmp/usr/share/doc/$package") { - doit("install","-g",0,"-o",0,"-m0644","debian/buildinfo.gz","$tmp/usr/share/doc/$package/buildinfo_$arch.gz"); + install_file("debian/buildinfo.gz","$tmp/usr/share/doc/$package/buildinfo_$arch.gz"); } }