Merge branch 'release'

hand fixed conflicts with NEWS

diff --git a/NEWS b/NEWS
index 02214143ee9a63000c1af5136a210d2cb17152e4..dbb929879988eb041374d8c5c476cdf979637bb1 100644 (file)
--- 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 0dcbb4e3f96e1d6eb641f9be96f8bf6775927e5e..6d2b25fd98f5161c3b85fac4edef7f9a78e6bedc 100644 (file)
--- 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 bac4fcb976c516aa926ff436f528bdf9ab5da54b..fb82015d1863274905cd901aae0f7b9e3aa922ef 100644 (file)
--- 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 3656cce951ca08263ae6cdfe8c0acf8ceb38f515..96349fa04986d1b806a74c8fe6ad2f639d5e4238 100755 (executable)
--- 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 a723ece79bca4c8caaf06aedfc39095c8bad643e..faa5fb2659b50e7cc267f99aa08638bef1ae97c3 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.22.1
+0.22.2