r54105 - in /desktop/unstable/seahorse/debian: changelog patches/build-with-gpg-2.2.patch patches/series

[jbicha at users.alioth.debian.org]

Author: jbicha
Date: Thu Sep 28 18:18:58 2017
New Revision: 54105

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54105
Log:
Fix build with GnuPG 2.2 (Closes: #876646)

Added:
    desktop/unstable/seahorse/debian/patches/build-with-gpg-2.2.patch
Modified:
    desktop/unstable/seahorse/debian/changelog
    desktop/unstable/seahorse/debian/patches/series

Modified: desktop/unstable/seahorse/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/changelog?rev=54105&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/changelog	[utf-8] (original)
+++ desktop/unstable/seahorse/debian/changelog	[utf-8] Thu Sep 28 18:18:58 2017
@@ -1,3 +1,11 @@
+seahorse (3.20.0-4) UNRELEASED; urgency=medium
+
+  * Acknowledge NMU (Closes: #859336)
+  * Add build-with-gpg-2.2.patch:
+    - Fix build with GnuPG 2.2 (Closes: #876646)
+
+ -- Jeremy Bicha <jbicha at debian.org>  Thu, 28 Sep 2017 14:08:34 -0400
+
 seahorse (3.20.0-3.1) unstable; urgency=medium
 
   * Non-maintainer upload.

Added: desktop/unstable/seahorse/debian/patches/build-with-gpg-2.2.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/build-with-gpg-2.2.patch?rev=54105&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/patches/build-with-gpg-2.2.patch	(added)
+++ desktop/unstable/seahorse/debian/patches/build-with-gpg-2.2.patch	[utf-8] Thu Sep 28 18:18:58 2017
@@ -0,0 +1,23 @@
+From 31a9a6ffc10f9737e70d7f0051ff590ff284ad07 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz at ubuntu.com>
+Date: Tue, 5 Sep 2017 00:01:16 +0200
+Subject: Accept GnuPG 2.2.x as supported version
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index fc4493c..723b46f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9,7 +9,7 @@ GCR_REQUIRED=3.11.91
+ GTK_REQ=3.4.0
+ GTK_MAX=GTK_VERSION_3_4
+ 
+-GNUPG_ACCEPTED="2.0.12 2.1.4"
++GNUPG_ACCEPTED="2.0.12 2.1.4 2.2.0"
+ GPGME_REQUIRED=1.7.0
+ LIBSECRET_REQUIRED=0.16
+ AVAHI_GLIB_REQUIRED=0.6
+

Modified: desktop/unstable/seahorse/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/series?rev=54105&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/seahorse/debian/patches/series	[utf-8] Thu Sep 28 18:18:58 2017
@@ -1 +1,2 @@
 01_ignore_KEY_CONSIDERED.patch
+build-with-gpg-2.2.patch