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

[Thijs Kinkhorst]

Author: kink-guest
Date: 2005-06-08 17:51:25 +0000 (Wed, 08 Jun 2005)
New Revision: 59

Modified:
   trunk/debian/changelog
   trunk/gpg-key2ps/gpg-key2ps
Log:
* gpg-key2ps: be a bit more liberal w.r.t. subkeys, so some
  don't break the PS output (Closes: #311990).


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-06-08 11:17:02 UTC (rev 58)
+++ trunk/debian/changelog	2005-06-08 17:51:25 UTC (rev 59)
@@ -4,8 +4,10 @@
     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>  Fri,  3 Jun 2005 11:12:48 +0200
+ -- Thijs Kinkhorst <kink at squirrelmail.org>  Wed,  8 Jun 2005 19:49:11 +0200
 
 signing-party (0.3.0-1) unstable; urgency=low
 

Modified: trunk/gpg-key2ps/gpg-key2ps
===================================================================
--- trunk/gpg-key2ps/gpg-key2ps	2005-06-08 11:17:02 UTC (rev 58)
+++ trunk/gpg-key2ps/gpg-key2ps	2005-06-08 17:51:25 UTC (rev 59)
@@ -189,7 +189,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:[^:]*:\([^:]*\):16:.\{8,8\}\(.\{8,8\}\):\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:.*/	(\3) (\2) (g) (\1) sbk/' \
+    -e 's/^sub:[^:]*:\([^:]*\):[^:]*:.\{8,8\}\(.\{8,8\}\):\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:.*/	(\3) (\2) (g) (\1) sbk/' \
     <$TMPFILE
 cat <<EOF
 } def