[Pgp-tools-commit] r65 - in trunk: debian gpg-key2ps

[Thijs Kinkhorst]

Author: kink-guest
Date: 2005-06-11 18:54:04 +0000 (Sat, 11 Jun 2005)
New Revision: 65

Modified:
   trunk/debian/changelog
   trunk/gpg-key2ps/gpg-key2ps
Log:
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.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-06-08 21:29:19 UTC (rev 64)
+++ trunk/debian/changelog	2005-06-11 18:54:04 UTC (rev 65)
@@ -4,8 +4,6 @@
     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 at squirrelmail.org>  Wed,  8 Jun 2005 19:49:11 +0200
 

Modified: trunk/gpg-key2ps/gpg-key2ps
===================================================================
--- trunk/gpg-key2ps/gpg-key2ps	2005-06-08 21:29:19 UTC (rev 64)
+++ trunk/gpg-key2ps/gpg-key2ps	2005-06-11 18:54:04 UTC (rev 65)
@@ -193,7 +193,7 @@
     -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