This is an automated email from the git hooks/post-receive script. osamu pushed a commit to branch master in repository devscripts.
commit 404f2b9fb1427c6e030e01ba9579af84fef85954 Author: Osamu Aoki <[email protected]> Date: Sat Sep 23 09:36:13 2017 +0900 debuild: support -ui Previously supported dpkg-buildpackage options: --force-sign -us -uc New supported dpkg-buildpackage options: --no-sign --unsigned-source --unsigned-changes -ui --unsigned-buildinfo Adjust unusual -uc -us -ui combination response message to the reality. Bump dpkg-dev version to support -ui option for dpkg-buildpackage Signed-off-by: Osamu Aoki <[email protected]> --- debian/changelog | 6 ++++++ debian/control | 2 +- scripts/debuild.pl | 29 ++++++++++++++++++++++++++--- test/test_package_lifecycle | 6 +++--- 4 files changed, 36 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 34380b2..4cb0b7f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,13 @@ devscripts (2.17.11) UNRELEASED; urgency=medium + [ James McCoy ] * Remove myself from Uploaders. + [ Osamu Aoki ] + * Support newer and long dpkg-buildpackage options --no-sign, + --unsigned-source, --unsigned-changes, -ui, and --unsigned-buildinfo and + bump dpkg-bev version to 1.18.19. Closes: #876024 + -- James McCoy <[email protected]> Wed, 13 Sep 2017 23:23:20 -0400 devscripts (2.17.10) unstable; urgency=medium diff --git a/debian/control b/debian/control index 812cde4..339e7ad 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: bash-completion, debhelper (>= 10), dh-python, docbook-xsl, - dpkg-dev (>= 1.17.6), + dpkg-dev (>= 1.18.19), file <!nocheck>, gnupg <!nocheck> | gnupg2 <!nocheck>, help2man, diff --git a/scripts/debuild.pl b/scripts/debuild.pl index b46de4c..539edf9 100755 --- a/scripts/debuild.pl +++ b/scripts/debuild.pl @@ -721,9 +721,11 @@ if ( $( != 0 && $) == 0 ) { $( = $) } # Our first task is to parse the command line options. # dpkg-buildpackage variables explicitly initialised in dpkg-buildpackage +my $nosign; my $forcesign; my $signsource = $changelog{Distribution} ne 'UNRELEASED'; my $signchanges = $changelog{Distribution} ne 'UNRELEASED'; +my $signbuildinfo = $changelog{Distribution} ne 'UNRELEASED'; my $binarytarget='binary'; my $since=''; my $usepause=0; @@ -739,7 +741,7 @@ my $dirn = basename(cwd()); # and one for us my @debsign_opts = (); # and one for dpkg-buildpackage if needed -my @dpkg_opts = qw(-us -uc); +my @dpkg_opts = qw(-us -uc -ui); my %debuild2dpkg = ( 'dpkg-buildpackage' => 'init', @@ -770,7 +772,12 @@ foreach (@dpkg_extra_opts) { /^-k/ and push(@debsign_opts, $_), next; # Ditto /^-[dD]$/ and next; # already been processed $_ eq '-us' and $signsource=0, next; + $_ eq '--unsigned-source' and $signsource=0, next; $_ eq '-uc' and $signchanges=0, next; + $_ eq '--unsigned-changes' and $signchanges=0, next; + $_ eq '-ui' and $signbuildinfo=0, next; + $_ eq '--unsigned-buildinfo' and $signbuildinfo=0, next; + $_ eq '--no-sign' and $nosign=1, next; $_ eq '--force-sign' and $forcesign=1, next; $_ eq '-ap' and $usepause=1, next; /^-a(.*)/ and $targetarch=$1, push(@dpkg_opts, $_), next; @@ -821,7 +828,12 @@ while ($_=shift) { /^-p/ and push(@debsign_opts, $_), next; # Key selection options /^-k/ and push(@debsign_opts, $_), next; # Ditto $_ eq '-us' and $signsource=0, next; + $_ eq '--unsigned-source' and $signsource=0, next; $_ eq '-uc' and $signchanges=0, next; + $_ eq '--unsigned-changes' and $signchanges=0, next; + $_ eq '-ui' and $signbuildinfo=0, next; + $_ eq '--unsigned-buildinfo' and $signbuildinfo=0, next; + $_ eq '--no-sign' and $nosign=1, next; $_ eq '--force-sign' and $forcesign=1, next; $_ eq '-ap' and $usepause=1, next; /^-a(.*)/ and $targetarch=$1, push(@dpkg_opts, $_), @@ -890,15 +902,26 @@ if (@ARGV) { } } +if ($nosign) { + $signchanges = 0; + $signsource = 0; + $signbuildinfo = 0; +} + if ($forcesign) { $signchanges = 1; $signsource = 1; + $signbuildinfo = 1; } if ($signchanges==1 and $signsource==0) { push @warnings, - "I will sign the .dsc file anyway as a signed .changes file was requested\n"; - $signsource=1; # may not be strictly necessary, but for clarity! + "Setting -us without setting -uc, signing .dsc anyway\n"; +} + +if ($signchanges==1 and $signbuildinfo==0) { + push @warnings, + "Setting -ui without setting -uc, signing .buildinfo anyway\n"; } # Next dpkg-buildpackage steps: diff --git a/test/test_package_lifecycle b/test/test_package_lifecycle index 93a0f5f..31183e0 100755 --- a/test/test_package_lifecycle +++ b/test/test_package_lifecycle @@ -125,7 +125,7 @@ test_debuild() { cd ${WORKDIR}/package_lifecycle/test COMMAND='debuild --no-conf --no-lintian --preserve-envvar=PATH --preserve-envvar=PERL5LIB --preserve-envvar=DEBFULLNAME --preserve-envvar=DEBEMAIL --preserve-envvar=GNUPGHOME --set-envvar=NO_PKG_MANGLE=1' cat > ${WORKDIR}/package_lifecycle/debuild.txt <<-EOS - dpkg-buildpackage -us -uc + dpkg-buildpackage -us -uc -ui dpkg-buildpackage: source package test dpkg-buildpackage: source version 1.0-1 dpkg-buildpackage: source distribution unstable @@ -269,7 +269,7 @@ test_debuild2() { cd ${WORKDIR}/package_lifecycle/test COMMAND='debuild --no-conf --no-lintian --preserve-envvar=PATH --preserve-envvar=PERL5LIB --preserve-envvar=DEBFULLNAME --preserve-envvar=DEBEMAIL --preserve-envvar=GNUPGHOME --set-envvar=NO_PKG_MANGLE=1' cat > ${WORKDIR}/package_lifecycle/debuild.txt <<-EOS - dpkg-buildpackage -us -uc + dpkg-buildpackage -us -uc -ui dpkg-buildpackage: source package test dpkg-buildpackage: source version 1.0-2 dpkg-buildpackage: source distribution UNRELEASED @@ -302,7 +302,7 @@ test_debuild_forcesign() { cd ${WORKDIR}/package_lifecycle/test COMMAND='debuild --no-conf --no-lintian --preserve-envvar=PATH --preserve-envvar=PERL5LIB --preserve-envvar=DEBFULLNAME --preserve-envvar=DEBEMAIL --preserve-envvar=GNUPGHOME --set-envvar=NO_PKG_MANGLE=1 --force-sign' cat > ${WORKDIR}/package_lifecycle/debuild.txt <<-EOS - dpkg-buildpackage -us -uc + dpkg-buildpackage -us -uc -ui dpkg-buildpackage: source package test dpkg-buildpackage: source version 1.0-2 dpkg-buildpackage: source distribution UNRELEASED -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git _______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
