Package: debian-keyring
Version: 2025.03.23
Severity: wishlist
Tags: patch

Hi!

The attached patches cleans up the OpenPGP nomenclature usage (and some
other minor lateral cleanups), in package documentation and in the
keyring filenames, while providing backward compatibility symlinks for
the old names so that people can transition easily. (I'd like for
example to be able to extend the filename refs to the keyrings in the
dpkg codebase for example. :)

This should also fix multiple pedantic lintian tags. :D

When looking into this, I realized that there might be a need to
perhaps update the keyring.debian.org and dsa-puppet side of this,
because I'm not sure if these changes will break that. But from a
quick scan over dsa-puppet, it was not immediately clear, and I don't
have visibility over keyring.debian.org. I'm happy to try to implement
any needed changes there, but if you can afford it, some minor hand
holding or assistance/guidance would be appreciated!

On the last attached patch I trimmed the git --stat output and replaced
it with a --shortstat one to avoid the bloat. And compressed the last
two patches to also reduce their size.

Thanks,
Guillem
From c8ee65297b1f34492876d32c7372677f3f285a39 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guil...@debian.org>
Date: Sun, 5 Jan 2025 20:35:09 +0100
Subject: [PATCH 1/4] =?UTF-8?q?Use=20=C2=ABDebian=C2=BB=20instead=20of=20t?=
 =?UTF-8?q?he=20odd=20=C2=ABDebian=20GNU=C2=BB=20when=20referring=20to=20t?=
 =?UTF-8?q?he=20project?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 debian/copyright | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 6e53a917..c835fb4f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-This is Debian GNU's GnuPG keyrings of developers keys.
+This is Debian GnuPG keyrings of developers keys.
 
 This package was originally put together by James Troup
 <ja...@nocrew.org> and Igor Grobman <i...@debian.org>.  It is now
@@ -23,7 +23,7 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License with
-your Debian GNU system, in /usr/share/common-licenses/GPL, or with the Debian
-GNU debian-keyring source package as the file COPYING.  If not, write
+your Debian system, in /usr/share/common-licenses/GPL, or with the
+Debian debian-keyring source package as the file COPYING.  If not, write
 to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301 USA.
-- 
2.49.0

From 2122d251ab329d9b2b6d9cf2f09b50c8e9d8590c Mon Sep 17 00:00:00 2001
From: Guillem Jover <guil...@debian.org>
Date: Sun, 5 Jan 2025 20:37:19 +0100
Subject: [PATCH 2/4] 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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 4a266c37..56693358 100644
--- a/debian/control
+++ b/debian/control
@@ -21,10 +21,10 @@ Recommends: gnupg (>= 1.0.6-4)
 Provides: debian-maintainers
 Conflicts: debian-maintainers
 Replaces: debian-maintainers
-Description: GnuPG keys of Debian Developers and Maintainers
+Description: OpenPGP certificates of Debian Developers and Maintainers
  The Debian project wants developers to digitally sign the
- announcements of their packages with GnuPG, to protect against
- forgeries.  This package contains keyrings of GnuPG and keys of
+ announcements of their packages with OpenPGP, to protect against
+ forgeries.  This package contains OpenPGP keyrings of
  Debian Developers (uploading and non-uploading), as well as of Debian
  Maintainers.
  .
-- 
2.49.0

Attachment: binBMPpv8DrH0.bin
Description: application/xz

Attachment: binXoIyfMLUmo.bin
Description: application/xz

Reply via email to