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=bb84915b93dd39b2f5faa202f9c6efd429b4b2ac commit bb84915b93dd39b2f5faa202f9c6efd429b4b2ac Author: Guillem Jover <[email protected]> AuthorDate: Wed Jul 30 01:07:02 2025 +0200 Dpkg::Vendor::Devuan: 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 | 2 ++ scripts/Dpkg/Vendor/Devuan.pm | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index 35d770617..64b649089 100644 --- a/debian/control +++ b/debian/control @@ -146,6 +146,7 @@ Breaks: debhelper (<< 10.10.1~), # Require .pgp extensions debian-keyring (<< 2025.04.25~), + devuan-keyring (<< 2025.07.30~), # 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. @@ -206,6 +207,7 @@ Suggests: Breaks: # Require .pgp extensions debian-keyring (<< 2025.04.25~), + devuan-keyring (<< 2025.07.30~), # 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/Devuan.pm b/scripts/Dpkg/Vendor/Devuan.pm index 8ec3773bb..44884a01c 100644 --- a/scripts/Dpkg/Vendor/Devuan.pm +++ b/scripts/Dpkg/Vendor/Devuan.pm @@ -38,12 +38,12 @@ sub run_hook { my ($self, $hook, @params) = @_; if ($hook eq 'package-keyrings') { - return ('/usr/share/keyrings/devuan-keyring.gpg', - '/usr/share/keyrings/devuan-maintainers.gpg'); + return ('/usr/share/keyrings/devuan-keyring.pgp', + '/usr/share/keyrings/devuan-maintainers.pgp'); } elsif ($hook eq 'archive-keyrings') { - return ('/usr/share/keyrings/devuan-archive-keyring.gpg'); + return ('/usr/share/keyrings/devuan-archive-keyring.pgp'); } elsif ($hook eq 'archive-keyrings-historic') { - return ('/usr/share/keyrings/devuan-archive-removed-keys.gpg'); + return ('/usr/share/keyrings/devuan-archive-removed-keys.pgp'); } elsif ($hook eq 'extend-patch-header') { my ($textref, $ch_info) = @params; if ($ch_info->{'Closes'}) { -- Dpkg.Org's dpkg
