Santiago Vila <sanv...@unex.es> writes:
> Package: src:notmuch
> Version: 0.22.1-2
> Severity: serious
>
> Dear maintainer:
>
> This package currently fails to build from source in stretch:
>
Attached please find a debdiff that fixes the problem in unstable. I'm
fairly certain it's the same problem (same spurious output) as in
testing. I'm not sure when I'll be able to upload this, so if someone
wants to NMU/sponsor it, feel free.
You can also find the changes in upstream git
git clone git://git.notmuchmail.org/git/notmuch -b release
diff -Nru notmuch-0.22.1/debian/changelog notmuch-0.22.1/debian/changelog
--- notmuch-0.22.1/debian/changelog 2016-07-19 20:51:33.000000000 +0900
+++ notmuch-0.22.1/debian/changelog 2016-08-14 13:31:13.000000000 +0900
@@ -1,3 +1,10 @@
+notmuch (0.22.1-3) unstable; urgency=medium
+
+ * Gag gdb even more. Bug fix: "FTBFS in testing", thanks to Santiago
+ Vila (Closes: #834271).
+
+ -- David Bremner <brem...@debian.org> Sun, 14 Aug 2016 13:31:13 +0900
+
notmuch (0.22.1-2) unstable; urgency=medium
* Add explicit build-depends on gnupg, for the test suite.
diff -Nru notmuch-0.22.1/debian/.gitignore notmuch-0.22.1/debian/.gitignore
--- notmuch-0.22.1/debian/.gitignore 2016-07-19 20:51:33.000000000 +0900
+++ notmuch-0.22.1/debian/.gitignore 1970-01-01 09:00:00.000000000 +0900
@@ -1,14 +0,0 @@
-tmp/
-libnotmuch-dev/
-libnotmuch*/
-notmuch-emacs/
-notmuch/
-notmuch-dbg/
-notmuch-mutt/
-notmuch-vim/
-ruby-notmuch/
-python*-notmuch/
-*.debhelper
-*.debhelper.log
-*.substvars
-files
diff -Nru notmuch-0.22.1/debian/patches/0001-test-make-gdb-even-quieter.patch notmuch-0.22.1/debian/patches/0001-test-make-gdb-even-quieter.patch
--- notmuch-0.22.1/debian/patches/0001-test-make-gdb-even-quieter.patch 1970-01-01 09:00:00.000000000 +0900
+++ notmuch-0.22.1/debian/patches/0001-test-make-gdb-even-quieter.patch 2016-08-14 13:31:13.000000000 +0900
@@ -0,0 +1,46 @@
+From af42874b5911791b8593aaeb1424c7ba444abd15 Mon Sep 17 00:00:00 2001
+From: David Bremner <da...@tethera.net>
+Date: Tue, 28 Jun 2016 23:08:54 +0200
+Subject: [PATCH] test: make gdb even quieter
+
+gdb sometimes writes warnings to stdout, which we don't need/want, and
+for some reason --batch-silent isn't enough to hide. So in this commit
+we write them to a log file, which is probably better for debugging
+anyway. To see an illustrative test failure before this change, run
+
+% make
+% touch notmuch-count.c
+% cd test && ./T060-count.sh
+
+(cherry picked from commit f45fa5bdd397d52473f7092f7ae3e2ffb9b7aee5)
+---
+ test/T060-count.sh | 2 ++
+ test/T070-insert.sh | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/test/T060-count.sh b/test/T060-count.sh
+index 0ac8314..d6933a7 100755
+--- a/test/T060-count.sh
++++ b/test/T060-count.sh
+@@ -103,6 +103,8 @@ restore_database
+
+ cat <<EOF > count-files.gdb
+ set breakpoint pending on
++set logging file count-files-gdb.log
++set logging on
+ break count_files
+ commands
+ shell cp /dev/null ${MAIL_DIR}/.notmuch/xapian/postlist.${db_ending}
+diff --git a/test/T070-insert.sh b/test/T070-insert.sh
+index e7ec6a6..c2485bb 100755
+--- a/test/T070-insert.sh
++++ b/test/T070-insert.sh
+@@ -192,6 +192,8 @@ for code in OUT_OF_MEMORY XAPIAN_EXCEPTION FILE_NOT_EMAIL \
+ gen_insert_msg
+ cat <<EOF > index-file-$code.gdb
+ set breakpoint pending on
++set logging file index-file-$code.log
++set logging on
+ break notmuch_database_add_message
+ commands
+ return NOTMUCH_STATUS_$code
diff -Nru notmuch-0.22.1/debian/patches/series notmuch-0.22.1/debian/patches/series
--- notmuch-0.22.1/debian/patches/series 1970-01-01 09:00:00.000000000 +0900
+++ notmuch-0.22.1/debian/patches/series 2016-08-14 13:31:13.000000000 +0900
@@ -0,0 +1,2 @@
+# exported from git by git-debcherry
+0001-test-make-gdb-even-quieter.patch
