[git] GnuPG - branch, master, updated. gnupg-2.1.16-59-g87972fd

[by Neal H. Walfield]

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, master has been updated
       via  87972fdef2cd853fb97624d0765686674a19e3c4 (commit)
      from  7572d270fcda1614648c6f08d711d5096ffebbe6 (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 87972fdef2cd853fb97624d0765686674a19e3c4
Author: Neal H. Walfield <neal at g10code.com>
Date:   Tue Dec 6 14:26:36 2016 +0100

    tests: Update distributed files
    
    * tests/openpgp/Makefile.am (TEST_FILES): Remove tofu-keys.asc,
    tofu-keys-secret.asc, tofu-2183839A-1.txt, tofu-BC15C85A-1.txt and
    tofu-EE37CF96-1.txt.  Add tofu/conflicting/1C005AF3.gpg,
    tofu/conflicting/1C005AF3-secret.gpg, tofu/conflicting/1C005AF3-1.txt,
    tofu/conflicting/1C005AF3-2.txt, tofu/conflicting/1C005AF3-3.txt,
    tofu/conflicting/1C005AF3-4.txt, tofu/conflicting/1C005AF3-5.txt,
    tofu/conflicting/B662E42F.gpg, tofu/conflicting/B662E42F-secret.gpg,
    tofu/conflicting/B662E42F-1.txt, tofu/conflicting/B662E42F-2.txt,
    tofu/conflicting/B662E42F-3.txt, tofu/conflicting/B662E42F-4.txt,
    tofu/conflicting/B662E42F-5.txt, tofu/conflicting/BE04EB2B.gpg,
    tofu/conflicting/BE04EB2B-secret.gpg, tofu/conflicting/BE04EB2B-1.txt,
    tofu/conflicting/BE04EB2B-2.txt, tofu/conflicting/BE04EB2B-3.txt,
    tofu/conflicting/BE04EB2B-4.txt, tofu/conflicting/BE04EB2B-5.txt and
    tofu/conflicting/README.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>
    Fixes-commit: d5b18d6

diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index 350b60a..43b00b0 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -113,8 +113,27 @@ TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \
              gpg.conf.tmpl gpg-agent.conf.tmpl \
 	     bug537-test.data.asc bug894-test.asc \
 	     bug1223-good.asc bug1223-bogus.asc 4gb-packet.asc \
-	     tofu-keys.asc tofu-keys-secret.asc \
-	     tofu-2183839A-1.txt tofu-BC15C85A-1.txt tofu-EE37CF96-1.txt \
+	     tofu/conflicting/1C005AF3.gpg \
+	     tofu/conflicting/1C005AF3-secret.gpg \
+	     tofu/conflicting/1C005AF3-1.txt \
+	     tofu/conflicting/1C005AF3-2.txt \
+	     tofu/conflicting/1C005AF3-3.txt \
+	     tofu/conflicting/1C005AF3-4.txt \
+	     tofu/conflicting/1C005AF3-5.txt \
+	     tofu/conflicting/B662E42F.gpg \
+	     tofu/conflicting/B662E42F-secret.gpg \
+	     tofu/conflicting/B662E42F-1.txt \
+	     tofu/conflicting/B662E42F-2.txt \
+	     tofu/conflicting/B662E42F-3.txt \
+	     tofu/conflicting/B662E42F-4.txt \
+	     tofu/conflicting/B662E42F-5.txt \
+	     tofu/conflicting/BE04EB2B.gpg \
+	     tofu/conflicting/BE04EB2B-secret.gpg \
+	     tofu/conflicting/BE04EB2B-1.txt \
+	     tofu/conflicting/BE04EB2B-2.txt \
+	     tofu/conflicting/BE04EB2B-3.txt \
+	     tofu/conflicting/BE04EB2B-4.txt \
+	     tofu/conflicting/BE04EB2B-5.txt \
 	     tofu/cross-sigs/EC38277E-secret.gpg \
 	     tofu/cross-sigs/EC38277E-1.gpg \
 	     tofu/cross-sigs/EC38277E-1.txt \

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

Summary of changes:
 tests/openpgp/Makefile.am | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)


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