[Pkg-privacy-commits] [seahorse-nautilus] 09/26: Import Debian patch 3.11.92-1.1

[Carlos Maddela]

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

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

commit 0f1c78ec9f90da391b5eb70d741bf3140dc56366
Author: Ulrike Uhlig <u at 451f.org>
Date:   Wed Nov 16 21:31:26 2016 +0100

    Import Debian patch 3.11.92-1.1
---
 debian/changelog                                   | 10 ++++++++
 ...rrect-flag-for-reaping-the-progress-child.patch | 26 -------------------
 debian/patches/gpg21.patch                         | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 68770f7..0b5ac6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+seahorse-nautilus (3.11.92-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * gpg21.patch: new patch, fixes FTBFS by supporting GnuPG 2.1;
+    Thanks to Adrian Bunk <bunk at stusta.de> for providing a patch.
+    (Closes: #835675)
+  * Really remove add-correct-flag-for-reaping-the-progress-child.patch.
+
+ -- Ulrike Uhlig <u at 451f.org>  Wed, 16 Nov 2016 21:31:26 +0100
+
 seahorse-nautilus (3.11.92-1) unstable; urgency=medium
 
   [ Clément Hermann (nodens) ]
diff --git a/debian/patches/add-correct-flag-for-reaping-the-progress-child.patch b/debian/patches/add-correct-flag-for-reaping-the-progress-child.patch
deleted file mode 100644
index d6c8e9b..0000000
--- a/debian/patches/add-correct-flag-for-reaping-the-progress-child.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Stef Walter <stefw at redhat.com>
-Date: Fri, 16 Aug 2013 17:24:11 +0000
-Subject: Add correct flag for reaping the progress child
-Origin: https://git.gnome.org/browse/seahorse-nautilus/commit/?id=c41f07cf5785b2d755b85f20bf0546c6ce2ebb02
-
-This fixes the WARNING about ECHILD that comes from some versions
-of glib. The WARNING was removed in later versions of glib, but this
-is also a good fix.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=697895
----
-diff --git a/tool/seahorse-tool-progress.c b/tool/seahorse-tool-progress.c
-index 613e82f..c039118 100644
---- a/tool/seahorse-tool-progress.c
-+++ b/tool/seahorse-tool-progress.c
-@@ -217,7 +217,7 @@ seahorse_tool_progress_start (const gchar *title)
-     argv[2] = (gchar *)title;
-     argv[3] = NULL;
- 
--    ret = g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_SEARCH_PATH,
-+    ret = g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
-                                     NULL, NULL, &progress_pid, &progress_fd, NULL, NULL, &err);
- 
-     if (!ret) {
---
-cgit v0.9.2
diff --git a/debian/patches/gpg21.patch b/debian/patches/gpg21.patch
new file mode 100644
index 0000000..15a62a6
--- /dev/null
+++ b/debian/patches/gpg21.patch
@@ -0,0 +1,29 @@
+Description: Accept GnuPG 2.1
+ This is the minimum change to fix the build,
+ upstream fixed this as part of a bigger change in 3.18
+Author: Adrian Bunk <bunk at stusta.de>
+Bug-Debian: https://bugs.debian.org/835675
+Forwarded: not-needed
+
+--- seahorse-nautilus-3.11.92.orig/configure.ac
++++ seahorse-nautilus-3.11.92/configure.ac
+@@ -57,7 +57,7 @@ AC_ARG_ENABLE(gpg-check,
+ 	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"
+ 	AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
+ 	ok="no"
+ 	if test "$GNUPG" != "no"; then
+--- seahorse-nautilus-3.11.92.orig/configure
++++ seahorse-nautilus-3.11.92/configure
+@@ -14879,7 +14891,7 @@ fi
+ 
+ 
+ if test	"$DO_CHECK" = "yes"; then
+-	accepted_versions="1.2 1.4 2.0"
++	accepted_versions="1.2 1.4 2.0 2.1"
+ 	for ac_prog in gpg gpg2
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..9861d15 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+gpg21.patch

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