The following commit has been merged in the master branch:
commit 864579ba8bdbddf23a018c3e10bff4c811b562ab
Author: James McCoy <[email protected]>
Date: Fri Nov 4 21:24:36 2011 -0400
Remove references to obsolete PGP keyrings in who-uploads/dscverify.
Signed-off-by: James McCoy <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index ac2e4c3..7652768 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,7 @@ devscripts (2.11.2) UNRELEASED; urgency=low
+ Parse sources files directly instead of invoking apt-cache. (Closes:
#376595)
+ Allow specifying which sources files to read. (Closes: #509983)
+ * Remove references to obsolete PGP keyrings in who-uploads/dscverify.
[ Stefano Rivera ]
* debchange: Add precise as a recognised Ubuntu distro.
diff --git a/scripts/dscverify.1 b/scripts/dscverify.1
index 157d54b..06803cf 100644
--- a/scripts/dscverify.1
+++ b/scripts/dscverify.1
@@ -4,7 +4,7 @@ dscverify \- verify the validity of a Debian package
.SH SYNOPSIS
\fBdscverify\fR [\fB\-\-keyring \fIkeyring\fR] ...
\fIchanges_or_dsc_filename\fR ...
.SH DESCRIPTION
-\fBdscverify\fR checks that the GPG or PGP signatures on the given
+\fBdscverify\fR checks that the GPG signatures on the given
\fI.changes\fR or \fI.dsc\fR files are good signatures made by keys in
the current Debian keyrings, found in the \fIdebian-keyring\fR
and \fIdebian-maintainers\fR
@@ -65,9 +65,9 @@ alias dscverify='dscverify \-\-keyring ~/.gnupg/pubring.gpg'
By default dscverify searches for the debian-keyring in the following
locations:
-- /org/keyring.debian.org/keyrings/debian-keyring.(gpg|pgp)
+- /org/keyring.debian.org/keyrings/debian-keyring.gpg
-- /usr/share/keyrings/debian-keyring.(pgp|gpg)
+- /usr/share/keyrings/debian-keyring.gpg
- /usr/share/keyrings/debian-maintainers.gpg
.SH "SEE ALSO"
diff --git a/scripts/dscverify.pl b/scripts/dscverify.pl
index c03e815..e7af118 100755
--- a/scripts/dscverify.pl
+++ b/scripts/dscverify.pl
@@ -96,8 +96,6 @@ sub get_rings {
my @rings = @_;
my @keyrings = qw(/org/keyring.debian.org/keyrings/debian-keyring.gpg
/usr/share/keyrings/debian-keyring.gpg
- /org/keyring.debian.org/keyrings/debian-keyring.pgp
- /usr/share/keyrings/debian-keyring.pgp
/usr/share/keyrings/debian-maintainers.gpg);
if (system('dpkg-vendor', '--derives-from', 'Ubuntu') == 0) {
unshift(@keyrings, qw(/usr/share/keyrings/ubuntu-master-keyring.gpg
diff --git a/scripts/who-uploads.1 b/scripts/who-uploads.1
index d6e3828..9f21706 100644
--- a/scripts/who-uploads.1
+++ b/scripts/who-uploads.1
@@ -25,7 +25,7 @@ uploader's GPG key.
.TP
\fB\-\-no\-default\-keyrings\fR
By default, \fBwho\-uploads\fR uses the three Debian keyrings
-\fI/usr/share/keyrings/debian-keyring.{gpg,pgp}\fR and
+\fI/usr/share/keyrings/debian-keyring.gpg\fR and
\fI/usr/share/keyrings/debian-maintainers.gpg\fR (although this
default can be changed in the configuration file, see below).
Specifying this option means that the default keyrings will not be
@@ -64,8 +64,8 @@ default, this is 3.
.TP
.B WHOUPLOADS_KEYRINGS
This is a colon-separated list of the default keyrings to be used. By
-default, it is the three Debian keyrings
-\fI/usr/share/keyrings/debian-keyring.{gpg,pgp}\fR
+default, it is the two Debian keyrings
+\fI/usr/share/keyrings/debian-keyring.gpg\fR
and
\fI/usr/share/keyrings/debian-maintainers.gpg\fR.
.SH AUTHOR
diff --git a/scripts/who-uploads.sh b/scripts/who-uploads.sh
index 332314b..3d75a94 100755
--- a/scripts/who-uploads.sh
+++ b/scripts/who-uploads.sh
@@ -64,7 +64,7 @@ GNU General Public License, version 2 or later."
# Boilerplate: set config variables
-DEFAULT_WHOUPLOADS_KEYRINGS=/usr/share/keyrings/debian-keyring.gpg:/usr/share/keyrings/debian-keyring.pgp:/usr/share/keyrings/debian-maintainers.gpg
+DEFAULT_WHOUPLOADS_KEYRINGS=/usr/share/keyrings/debian-keyring.gpg:/usr/share/keyrings/debian-maintainers.gpg
DEFAULT_WHOUPLOADS_MAXUPLOADS=3
DEFAULT_WHOUPLOADS_DATE=no
VARS="WHOUPLOADS_KEYRINGS WHOUPLOADS_MAXUPLOADS WHOUPLOADS_DATE"
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
