Revert r44, as it displayed revoked subkeys as regular.

Reopens: #311990, because we still need to resolve this issue
(not display revoked subkeys at all?), but it's better to generate
faulty PS than to display incorrect info.

git-svn-id: svn://svn.debian.org/pgp-tools/trunk@65 b513b33f-fedd-0310-b452-c3deb5f4c849

diff --git a/debian/changelog b/debian/changelog
index 7d651397c86f56475465660b816411cc6333fff9..3a46644a4c683ccbde26835aa29b8c68f744514d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,6 @@ 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 <kink@squirrelmail.org>  Wed,  8 Jun 2005 19:49:11 +0200
 

diff --git a/gpg-key2ps/gpg-key2ps b/gpg-key2ps/gpg-key2ps
index 8a57289b7d8611e6b7fa123fb59261cc746eb255..fab1936a59837a806192a845baea8ddb919193c4 100755 (executable)
--- a/gpg-key2ps/gpg-key2ps
+++ b/gpg-key2ps/gpg-key2ps
@@ -193,7 +193,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:[^:]*:\([^:]*\):[^:]*:.\{8,8\}\(.\{8,8\}\):\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:.*/    (\3) (\2) (g) (\1) sbk/' \
+    -e 's/^sub:[^:]*:\([^:]*\):16:.\{8,8\}\(.\{8,8\}\):\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:.*/       (\3) (\2) (g) (\1) sbk/' \
     <$TMPFILE
 cat <<EOF
 } def