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=6ddebbdc8806e69c1869f8f9895f95fd48a5abbb commit 6ddebbdc8806e69c1869f8f9895f95fd48a5abbb Author: Guillem Jover <[email protected]> AuthorDate: Sat May 24 20:48:57 2025 +0200 Dpkg::Vendor::Debian: Use .pgp keyrings instead of .gpg ones The .gpg keyrings are now considered deprecated and provided via compatibility symlinks. Use the .pgp ones which avoids an indirection, and makes the code future proof, for when the old ones disappear. --- debian/control | 4 ++++ scripts/Dpkg/Vendor/Debian.pm | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/debian/control b/debian/control index eae8eb9bd..35d770617 100644 --- a/debian/control +++ b/debian/control @@ -144,6 +144,8 @@ Suggests: Breaks: # Force R³ support, w/o requiring debhelper users to depend on dpkg-dev. debhelper (<< 10.10.1~), +# Require .pgp extensions + debian-keyring (<< 2025.04.25~), # Uses new sq features, w/o requiring a hard dependency on sq. sq (<< 0.40.0~), # Uses new sqv features, w/o requiring a hard dependency on sqv. @@ -202,6 +204,8 @@ Suggests: # Needed by Dpkg::Source::Package::V3::Bzr bzr, Breaks: +# Require .pgp extensions + debian-keyring (<< 2025.04.25~), # Uses the private Dpkg::Shlibs::SymbolFile module with no API stability # guarantees! Which obviously broke with 1.19.0. pkg-kde-tools (<< 0.15.28~), diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm index f7272ad61..4cd6b8943 100644 --- a/scripts/Dpkg/Vendor/Debian.pm +++ b/scripts/Dpkg/Vendor/Debian.pm @@ -50,14 +50,14 @@ sub run_hook { my ($self, $hook, @params) = @_; if ($hook eq 'package-keyrings') { - return ('/usr/share/keyrings/debian-keyring.gpg', + return ('/usr/share/keyrings/debian-keyring.pgp', '/usr/share/keyrings/debian-tag2upload.pgp', - '/usr/share/keyrings/debian-nonupload.gpg', - '/usr/share/keyrings/debian-maintainers.gpg'); + '/usr/share/keyrings/debian-nonupload.pgp', + '/usr/share/keyrings/debian-maintainers.pgp'); } elsif ($hook eq 'archive-keyrings') { - return ('/usr/share/keyrings/debian-archive-keyring.gpg'); + return ('/usr/share/keyrings/debian-archive-keyring.pgp'); } elsif ($hook eq 'archive-keyrings-historic') { - return ('/usr/share/keyrings/debian-archive-removed-keys.gpg'); + return ('/usr/share/keyrings/debian-archive-removed-keys.pgp'); } elsif ($hook eq 'builtin-build-depends') { return qw(build-essential:native); } elsif ($hook eq 'builtin-build-conflicts') { -- Dpkg.Org's dpkg
