Control: merge 835675 835702
Control: tags 835675 +fixed-upstream
Control: tags 835675 +patch
The two seahorse-nautilus FTBFS bugs are the same bug.
It would also be helpful to not just dump the last lines of the build
output when this is a config.log dump - having the dump in the log can
be helpful when debugging, but it is very verbose debug output of
everything and therefore mostly unrelated to the actual problem.
The actual problem is before the config.log dump:
checking for gpg... /usr/bin/gpg
checking for appropriate GnuPG version... configure: error: Appropriate version
of GnuPG not found. Please install one of versions: 1.2 1.4 2.0
The proper solution would be to upgrade seahorse-nautilus to a
non-ancient version, but the attached patch is sufficient to fix
the build.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
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 <[email protected]>
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.
