Merge branch 'release'

hand fixed conflicts with NEWS

5 files changed, 33 insertions, 4 deletions

diff --git a/NEWS b/NEWS
index 02214143..dbb92987 100644
--- a/NEWS
+++ b/NEWS
@@ -30,6 +30,21 @@ Fixed constant values so they are not all zero anymore.
   both set to zero.
   The same issue occured with sort modes.
 
+Notmuch 0.22.2 (2016-09-08)
+===========================
+
+Test Suite
+----------
+
+Silence gdb more
+
+  Have gdb write to a log file instead of stdout, hiding some more
+  (harmless) stderr chatter which causes test failures.
+
+Hardcode fingerprint in PGP/MIME tests
+
+  Make the tests more robust against changing GnuPG output formats.
+
 Notmuch 0.22.1 (2016-07-19)
 ===========================
 
diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index 0dcbb4e3..6d2b25fd 100644
--- a/bindings/python/notmuch/version.py
+++ b/bindings/python/notmuch/version.py
@@ -1,3 +1,3 @@
 # this file should be kept in sync with ../../../version
-__VERSION__ = '0.22.1'
+__VERSION__ = '0.22.2'
 SOVERSION = '4'
diff --git a/debian/changelog b/debian/changelog
index bac4fcb9..fb82015d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+notmuch (0.22.2-1) unstable; urgency=medium
+
+  * Fix test suite compatibility with GnuPG 2.1.15.  Bug fix: "FTBFS:
+    Tests failures", thanks to Lucas Nussbaum (Closes: #837013).
+
+ -- David Bremner <bremner@debian.org>  Thu, 08 Sep 2016 19:09:53 -0300
+
+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 <bremner@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 --git a/test/T350-crypto.sh b/test/T350-crypto.sh
index 3656cce9..96349fa0 100755
--- a/test/T350-crypto.sh
+++ b/test/T350-crypto.sh
@@ -25,8 +25,8 @@ add_gnupg_home ()
 ##################################################
 
 add_gnupg_home
-# get key fingerprint
-FINGERPRINT=$(gpg --no-tty --list-secret-keys --with-colons --fingerprint | grep '^fpr:' | cut -d: -f10)
+# Change this if we ship a new test key
+FINGERPRINT="5AEAB11F5E33DCE875DDB75B6D92612D94E46381"
 
 test_expect_success 'emacs delivery of signed message' \
 'emacs_fcc_message \
diff --git a/version b/version
index a723ece7..faa5fb26 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.22.1
+0.22.2