Package: elbe-archive-keyring
Version: 20230613
Severity: wishlist
Tags: patch

Hi!

The attached patches cleans up the OpenPGP nomenclature usage, in
package documentation and in the keyring filenames, while providing
backward compatibility symlinks for the old names so that people
can transition easily. Also a NEWS entry to explain all this.

This should fix multiple pedantic lintian tags. :D

(BTW I didn't find where this keyring originates from, it might be
nice to document that in the Homepage, debian/copyright or upstream
metadata files.)

Thanks,
Guillem
From 361464d7afd923a2b5a1e0574a2548482bfeab82 Mon Sep 17 00:00:00 2001
From: Guillem Jover <[email protected]>
Date: Wed, 14 Jan 2026 01:49:19 +0100
Subject: [PATCH 1/2] Use OpenPGP instead of GnuPG when referring to the
 specification

The name of specification is OpenPGP, and while GnuPG is currently
a widespread implementation, using a specific vendor as if was a
synonym for the specification is a disservice to the whole ecosystem,
more so now that GnuPG upstream has decided to get out of the IETF
working group and not follow the just released OpenPGP RFC.

Use OpenPGP to refer both to the specification and its artifacts.
---
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 285c191..594dd5f 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,6 @@ Multi-Arch: foreign
 Depends: ${misc:Depends}
 Recommends: gpgv
 Conflicts: elbe-keyring
-Description: GnuPG keys of the elbe archive
+Description: OpenPGP archive certificates of the elbe archive
  The elbe project digitally signs its Release files. This package
- contains the archive keys used for that.
+ contains the archive certificates used for that.
-- 
2.51.0

From 69e475d43a46404189e81c0fd9367f807d111207 Mon Sep 17 00:00:00 2001
From: Guillem Jover <[email protected]>
Date: Wed, 14 Jan 2026 01:53:52 +0100
Subject: [PATCH 2/2] Rename keyrings from .gpg to .pgp

These keyrings contain OpenPGP certificates, and are not vendor
specific, so naming them with an extension after GnuPG in detriment
to the other multiple OpenPGP implementations does not promote
the interoperability one would expect from that ecosystem.

Given that these files are API, and will have external references,
we add backwards compatibility symlinks for now, but which should
be considered deprecated and should eventually (in the future) be
obsoleted and removed.

Add a NEWS entry explaining the transition and timeline.
---
 debian/NEWS                                         |   7 +++++++
 debian/install                                      |   2 +-
 debian/links                                        |   2 ++
 ...archive-keyring.gpg => elbe-archive-keyring.pgp} | Bin
 4 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 debian/NEWS
 create mode 100644 debian/links
 rename keyrings/{elbe-archive-keyring.gpg => elbe-archive-keyring.pgp} (100%)

diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..c597b7c
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,7 @@
+elbe-keyring (20230613) unstable; urgency=medium
+
+  Certificate (keyring) files in /usr/share/keyrings now have the
+  file extension .pgp, rather than .gpg. Compatibility links are
+  provided and will be removed after Debian 14 'forky'.
+
+ -- Guillem Jover <[email protected]>  Wed, 14 Jan 2026 01:54:33 +0100
diff --git a/debian/install b/debian/install
index de20958..4887169 100644
--- a/debian/install
+++ b/debian/install
@@ -1 +1 @@
-keyrings/*.gpg	usr/share/keyrings/
+keyrings/*.pgp	usr/share/keyrings/
diff --git a/debian/links b/debian/links
new file mode 100644
index 0000000..305fadc
--- /dev/null
+++ b/debian/links
@@ -0,0 +1,2 @@
+# For backwards compatibility, removed after Debian forky.
+usr/share/keyrings/elbe-archive-keyring.pgp usr/share/keyrings/elbe-archive-keyring.gpg
diff --git a/keyrings/elbe-archive-keyring.gpg b/keyrings/elbe-archive-keyring.pgp
similarity index 100%
rename from keyrings/elbe-archive-keyring.gpg
rename to keyrings/elbe-archive-keyring.pgp
-- 
2.51.0

Reply via email to