gpg: Change armor Version header to emit only the major version.
authorWerner Koch <wk@gnupg.org>
Wed, 27 Nov 2013 08:20:02 +0000 (09:20 +0100)
committerWerner Koch <wk@gnupg.org>
Wed, 27 Nov 2013 10:00:55 +0000 (11:00 +0100)
commitb135372176b29ca985afa18398a455fd4e2a2063
tree1872103830d10015f979428f6cf371ab007b3f1d
parentcad8216f9a0b33c9dc84ecc4f385b00045e7b496
gpg: Change armor Version header to emit only the major version.

* g10/options.h (opt): Rename field no_version to emit_version.
* g10/gpg.c (main): Init opt.emit_vesion to 1.  Change --emit-version
to bump up opt.emit_version.
* g10/armor.c (armor_filter): Implement different --emit-version
values.
--

GnuPG-bug-id: 1572
Signed-off-by: Werner Koch <wk@gnupg.org>
(cherry picked from commit e951782e937ce290be0d89d83e84b3daea997587)

Resolved conflicts:
NEWS
g10/armor.c
g10/gpg.c
NEWS
doc/gpg.texi
g10/armor.c
g10/gpg.c
g10/options.h