[git] GnuPG - branch, STABLE-BRANCH-1-4, updated. gnupg-1.4.18-19-gc935c73

[by Werner Koch]

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  c935c73f8262dcce7d5ac823ba4a6a2f563cc3eb (commit)
      from  2d359681f08999686734421228cb69893d8a0060 (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 c935c73f8262dcce7d5ac823ba4a6a2f563cc3eb
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Nov 24 20:01:45 2014 +0100

    doc: Do not install gnupg.7
    
    --
    GnuPG-bug-id: 1770

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9fd9f6b..4294f83 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -28,7 +28,10 @@ myman_pages   = gpg.1 gpgv.1
 
 info_TEXINFOS = gnupg1.texi
 
-man_MANS = $(myman_pages) gnupg.7 gpg-zip.1
+# We do not install gnupg.7 because 2.1 does it also be default.  This
+# is the more future proof way of handling it.
+man_MANS = $(myman_pages) gpg-zip.1
+noinst_man_MANS = gnupg.7
 
 gnupg1_TEXINFOS = gnupg1.texi
 

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

Summary of changes:
 doc/Makefile.am |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


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