This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=3f8e1616e007a625a1b550e6084c36fa9ce9c902 commit 3f8e1616e007a625a1b550e6084c36fa9ce9c902 Author: Guillem Jover <[email protected]> AuthorDate: Fri Oct 28 03:38:24 2022 +0200 dpkg-buildpackage: Add new --sign-keyid and alias --sign-key to it Using «key» is confusing when what we mean is the «keyid». --- man/dpkg-buildpackage.pod | 7 +++++-- scripts/dpkg-buildpackage.pl | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/man/dpkg-buildpackage.pod b/man/dpkg-buildpackage.pod index 54d503b4e..aa51ec9b9 100644 --- a/man/dpkg-buildpackage.pod +++ b/man/dpkg-buildpackage.pod @@ -527,10 +527,13 @@ I<sign-command> will get all the arguments that B<gpg> would have gotten. I<sign-command> should not contain spaces or any other shell metacharacters. -=item B<-k>, B<--sign-key=>I<key-id> +=item B<-k>, B<--sign-keyid=>I<key-id> + +=item B<--sign-key=>I<key-id> Specify an OpenPGP key-ID (either a fingerprint or a user-ID) for the -secret key to use when signing packages (long option since dpkg 1.18.8). +secret key to use when signing packages (B<--sign-key> since dpkg 1.18.8, +B<--sign-keyid> since dpkg 1.21.10). =item B<-us>, B<--unsigned-source> diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl index cc32cd8b8..329408417 100755 --- a/scripts/dpkg-buildpackage.pl +++ b/scripts/dpkg-buildpackage.pl @@ -111,7 +111,8 @@ sub usage { -p, --sign-command=<command> command to sign .dsc and/or .changes files (default is gpg). - -k, --sign-key=<keyid> the key to use for signing. + -k, --sign-keyid=<keyid> the key id to use for signing. + --sign-key=<keyid> alias for -k, --sign-keyid. -ap, --sign-pause add pause before starting signature process. -us, --unsigned-source unsigned source package. -ui, --unsigned-buildinfo unsigned .buildinfo file. @@ -287,7 +288,7 @@ while (@ARGV) { warning(g_('%s is deprecated; it is without effect'), $1); } elsif (/^(?:-p|--sign-command=)(.*)$/) { $signcommand = $1; - } elsif (/^(?:-k|--sign-key=)(.*)$/) { + } elsif (/^(?:-k|--sign-keyid=|--sign-key=)(.*)$/) { $signkeyid = $1; } elsif (/^--(no-)?check-builddeps$/) { $checkbuilddep = !(defined $1 and $1 eq 'no-'); -- Dpkg.Org's dpkg
