From e7ab88242d5d6ee2e3083f25fc645349d7ad65d7 Mon Sep 17 00:00:00 2001 From: kink-guest Date: Wed, 8 Jun 2005 17:51:25 +0000 Subject: [PATCH] * gpg-key2ps: be a bit more liberal w.r.t. subkeys, so some don't break the PS output (Closes: #311990). git-svn-id: svn://svn.debian.org/pgp-tools/trunk@59 b513b33f-fedd-0310-b452-c3deb5f4c849 --- debian/changelog | 4 +++- gpg-key2ps/gpg-key2ps | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ccf5da2..7d65139 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,10 @@ signing-party (0.4.0-1) unstable; urgency=low and gpgsigs as well. * Update gpg-mailkeys man page to list environment vars introduced in 0.3.0 (Closes: #310418). + * gpg-key2ps: be a bit more liberal w.r.t. subkeys, so some + don't break the PS output (Closes: #311990). - -- Thijs Kinkhorst Fri, 3 Jun 2005 11:12:48 +0200 + -- Thijs Kinkhorst Wed, 8 Jun 2005 19:49:11 +0200 signing-party (0.3.0-1) unstable; urgency=low diff --git a/gpg-key2ps/gpg-key2ps b/gpg-key2ps/gpg-key2ps index 789d6d0..c4efc63 100755 --- a/gpg-key2ps/gpg-key2ps +++ b/gpg-key2ps/gpg-key2ps @@ -189,7 +189,7 @@ sed -e '/^tru:/d' \ -e 's/@split@\(.\{4,4\}\)\(.\{4,4\}\)\(.\{4,4\}\)\(.\{4,4\}\)\(.\{4,4\}\)@/\1 \2 \3 \4 \5/g' \ -e 's/^uid:[^:r]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:\([^:]*\):.*/ (\1) uid/' \ -e 's/^uid:r[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:\([^:]*\):.*/ (\1) revuid/' \ - -e 's/^sub:[^:]*:\([^:]*\):16:.\{8,8\}\(.\{8,8\}\):\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:.*/ (\3) (\2) (g) (\1) sbk/' \ + -e 's/^sub:[^:]*:\([^:]*\):[^:]*:.\{8,8\}\(.\{8,8\}\):\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:.*/ (\3) (\2) (g) (\1) sbk/' \ <$TMPFILE cat <