[Pkg-privacy-commits] [seahorse-nautilus] 01/08: Update (and rename) gpg21 patch to allow building with GnuPG 2.2

[Clement Hermann]

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

nodens-guest pushed a commit to branch master
in repository seahorse-nautilus.

commit be21a3eb7808c28272fee5e8ab8595a29428d8cc
Author: Clément Hermann <nodens at nodens.org>
Date:   Sun Nov 5 14:14:33 2017 +0100

    Update (and rename) gpg21 patch to allow building with GnuPG 2.2
    
    (Closes: #876603)
---
 debian/patches/{gpg21.patch => gpg2.patch} | 14 ++++++--------
 debian/patches/series                      |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/debian/patches/gpg21.patch b/debian/patches/gpg2.patch
similarity index 67%
rename from debian/patches/gpg21.patch
rename to debian/patches/gpg2.patch
index 9b52246..2b435c9 100644
--- a/debian/patches/gpg21.patch
+++ b/debian/patches/gpg2.patch
@@ -1,30 +1,28 @@
 From: Adrian Bunk <bunk at stusta.de>
 Date: Tue, 20 Sep 2016 12:23:21 +0300
-Subject: Accept GnuPG 2.1
+Subject: Accept GnuPG 2.1 and 2.2
 
-Description: Accept GnuPG 2.1
+Description: Accept GnuPG 2.1 and 2.2
  This is the minimum change to fix the build,
- upstream fixed this as part of a bigger change in 3.18
+ upstream fixed this as part of a bigger change in 3.18 (unreleased)
 Author: Adrian Bunk <bunk at stusta.de>
 Bug-Debian: https://bugs.debian.org/835675
 Forwarded: not-needed
-Last-Update: 2017-01-08
+Last-Update: 2017-11-05
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 ---
  configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/configure.ac b/configure.ac
-index 471b34d..ac56984 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -57,7 +57,7 @@ AC_ARG_ENABLE(gpg-check,
+@@ -57,7 +57,7 @@
  	DO_CHECK=$enableval, DO_CHECK=yes)
  
  if test	"$DO_CHECK" = "yes"; then
 -	accepted_versions="1.2 1.4 2.0"
-+	accepted_versions="1.2 1.4 2.0 2.1"
++	accepted_versions="1.2 1.4 2.0 2.1 2.2"
  	AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
  	ok="no"
  	if test "$GNUPG" != "no"; then
diff --git a/debian/patches/series b/debian/patches/series
index 096ad6a..ce9d90c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-gpg21.patch
+gpg2.patch
 update-Makefile-am.patch
 fix-warnings.patch
 fix-desktop-files.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/seahorse-nautilus.git