[git] GnuPG - branch, STABLE-BRANCH-1-4, updated. gnupg-1.4.12-21-ge71dbf2

[by David Shaw]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, STABLE-BRANCH-1-4 has been updated
       via  e71dbf244a2b6e7edcca37ac9544000f0629de0e (commit)
      from  3ab272086cdd39cc982b6deccd827a3cdb804cf1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e71dbf244a2b6e7edcca37ac9544000f0629de0e
Author: David Shaw <dshaw at jabberwocky.com>
Date:   Fri Nov 30 12:39:05 2012 -0500

    Fix mksamplekeys awk to not leave out the whitespace altogether

diff --git a/doc/mksamplekeys b/doc/mksamplekeys
index e5db52c..9c2b596 100755
--- a/doc/mksamplekeys
+++ b/doc/mksamplekeys
@@ -4,9 +4,7 @@
 keys="1E42B367 4F25E3B6 5B0358A2 57548DCD 99242560 CA57AD7C B2D7795E 1CE0C630"
 
 for i in $keys; do
-  gpg --list-keys $i | awk ' ( $0 != "") { print "  " $0 }'
+  gpg --list-keys $i | awk '{ if ( $0 != "") print "  " $0; else print $0; }'
 done
 echo
 gpg --export-options export-minimal --export -a $keys
-
-
diff --git a/doc/samplekeys.asc b/doc/samplekeys.asc
index 4d16c10..a6ea4cb 100644
--- a/doc/samplekeys.asc
+++ b/doc/samplekeys.asc
@@ -3,25 +3,31 @@
   uid                  Werner Koch <wk at g10code.com>
   sub   1024D/77F95F95 2011-11-02
   sub   2048R/C193565B 2011-11-07 [expires: 2013-12-31]
+
   pub   2048R/4F25E3B6 2011-01-12 [expires: 2019-12-31]
   uid                  Werner Koch (dist sig)
   sub   2048R/AC87C71A 2011-01-12 [expires: 2019-12-31]
+
   pub   1024D/5B0358A2 1999-03-15 [expired: 2011-07-11]
   uid                  Werner Koch <wk at gnupg.org>
   uid                  Werner Koch <wk at g10code.com>
   uid                  Werner Koch
   uid                  Werner Koch <werner at fsfe.org>
+
   pub   1024D/57548DCD 1998-07-07 [expired: 2005-12-31]
   uid                  Werner Koch (gnupg sig) <dd9jn at gnu.org>
+
   pub   4096R/99242560 2002-01-28
   uid                  David M. Shaw <dshaw at jabberwocky.com>
   sub   2048R/A1BC4FA4 2012-01-10 [expires: 2017-01-31]
   sub   2048R/6F410A43 2012-01-10 [expires: 2017-01-31]
+
   pub   2048R/CA57AD7C 2004-12-06
   uid                  PGP Global Directory Verification Key
   uid                  [jpeg image of size 3400]
   uid                  DNR KS1 <do-not-reply at keyserver1.pgp.com>
   uid                  DNR-KS2 <do-not-reply at keyserver2.pgp.com>
+
   pub   1024D/B2D7795E 2001-01-04
   uid                  Philip R. Zimmermann <prz at mit.edu>
   uid                  Philip R. Zimmermann <prz at acm.org>
@@ -29,9 +35,11 @@
   uid                  [jpeg image of size 3457]
   uid                  Philip R. Zimmermann <prz at philzimmermann.com>
   sub   3072g/A8E92834 2001-01-04
+
   pub   1024R/1CE0C630 2006-01-01 [expired: 2011-06-30]
   uid                  Werner Koch (dist sig) <dd9jn at gnu.org>
 
+
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 

-----------------------------------------------------------------------

Summary of changes:
 doc/mksamplekeys   |    4 +---
 doc/samplekeys.asc |    8 ++++++++
 2 files changed, 9 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org