[Pkg-gnupg-commit] [gnupg2] 200/205: upstream now avoids the gpgtar test when gpgtar isn't built

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 59242b930ec8f9df835e14ff136312bc1287348e
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Tue May 10 21:58:58 2016 -0400

    upstream now avoids the gpgtar test when gpgtar isn't built
    
    see upstream's a883d4c0f8125e809c144ec69e76c9f522102d8f for their
    chosen resolution (returning 77 if the executable doesn't exist)
---
 ...ar.test-when-disable-gpgtar-is-configured.patch | 35 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 36 deletions(-)

diff --git a/debian/patches/0004-avoid-gpgtar.test-when-disable-gpgtar-is-configured.patch b/debian/patches/0004-avoid-gpgtar.test-when-disable-gpgtar-is-configured.patch
deleted file mode 100644
index c616888..0000000
--- a/debian/patches/0004-avoid-gpgtar.test-when-disable-gpgtar-is-configured.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
-Date: Thu, 4 Feb 2016 15:59:28 -0500
-Subject: avoid gpgtar.test when --disable-gpgtar is configured
-
----
- tests/openpgp/Makefile.am | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
-index bab0b7d..98121f9 100644
---- a/tests/openpgp/Makefile.am
-+++ b/tests/openpgp/Makefile.am
-@@ -41,6 +41,13 @@ else
- sqlite3_dependent_tests =
- endif
- 
-+if BUILD_GPGTAR
-+gpgtar_tests = gpgtar.test
-+else
-+gpgtar_tests =
-+endif
-+
-+
- # Note: version.test needs to be the first test to run and finish.test
- # the last one
- TESTS = version.test mds.test \
-@@ -56,7 +63,7 @@ TESTS = version.test mds.test \
- 	multisig.test verify.test armor.test \
- 	import.test ecc.test 4gb-packet.test \
- 	$(sqlite3_dependent_tests) \
--	gpgtar.test use-exact-key.test default-key.test \
-+	$(gpgtar_tests) use-exact-key.test default-key.test \
- 	finish.test
- 
- 
diff --git a/debian/patches/series b/debian/patches/series
index c3cd254..f3de40b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0002-avoid-beta-warning.patch
 0003-Avoid-simple-memory-dumps-via-ptrace.patch
-0004-avoid-gpgtar.test-when-disable-gpgtar-is-configured.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git