Hi,

built and tested the binary. Looks good!

Cheers!
u.
diff -Nru seahorse-nautilus-3.11.92/debian/changelog 
seahorse-nautilus-3.11.92/debian/changelog
--- seahorse-nautilus-3.11.92/debian/changelog  2014-09-15 21:35:21.000000000 
+0200
+++ seahorse-nautilus-3.11.92/debian/changelog  2016-11-16 21:34:02.000000000 
+0100
@@ -1,3 +1,10 @@
+seahorse-nautilus (3.11.92-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Really remove add-correct-flag-for-reaping-the-progress-child.patch.
+
+ -- Ulrike Uhlig <u...@451f.org>  Wed, 16 Nov 2016 21:31:26 +0100
+
 seahorse-nautilus (3.11.92-1) unstable; urgency=medium
 
   [ Clément Hermann (nodens) ]
diff -Nru 
seahorse-nautilus-3.11.92/debian/patches/add-correct-flag-for-reaping-the-progress-child.patch
 
seahorse-nautilus-3.11.92/debian/patches/add-correct-flag-for-reaping-the-progress-child.patch
--- 
seahorse-nautilus-3.11.92/debian/patches/add-correct-flag-for-reaping-the-progress-child.patch
      2014-03-23 00:20:50.000000000 +0100
+++ 
seahorse-nautilus-3.11.92/debian/patches/add-correct-flag-for-reaping-the-progress-child.patch
      1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-From: Stef Walter <st...@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 -Nru seahorse-nautilus-3.11.92/debian/patches/gpg21.patch 
seahorse-nautilus-3.11.92/debian/patches/gpg21.patch
--- seahorse-nautilus-3.11.92/debian/patches/gpg21.patch        1970-01-01 
01:00:00.000000000 +0100
+++ seahorse-nautilus-3.11.92/debian/patches/gpg21.patch        2016-11-16 
21:30:02.000000000 +0100
@@ -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 <b...@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 -Nru seahorse-nautilus-3.11.92/debian/patches/series 
seahorse-nautilus-3.11.92/debian/patches/series
--- seahorse-nautilus-3.11.92/debian/patches/series     2014-09-15 
21:31:16.000000000 +0200
+++ seahorse-nautilus-3.11.92/debian/patches/series     2016-11-16 
21:30:02.000000000 +0100
@@ -0,0 +1 @@
+gpg21.patch

Reply via email to