Merge branch 'release'

20.1 plus NEWS fixup

diff --git a/NEWS b/NEWS
index 64388cd333720d1bbeb5a0498209818d46bd404c..03254d5904b5147bcbdee0449d53ffd6d413fe86 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+Notmuch 0.20.1 (2015-06-01)
+===========================
+
+Test Suite
+----------
+
+Work around apparent gdb bug on arm64
+
 Notmuch 0.20 (2015-05-31)
 =========================
 

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index 55014249c63f36707bb0fcec4e5fe2b8793393a4..aa6fe2105c80c878ec81f30a2fc57f77dcf362e2 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.20'
+__VERSION__ = '0.20.1'
 SOVERSION = '4'

diff --git a/debian/changelog b/debian/changelog
index 9300dddce0122faa39e51738a2a39a915371b2fc..f338ddfb2e6770eeb79178d97aa91bd0b6d8e285 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+notmuch (0.20.1-1) unstable; urgency=medium
+
+  * Bug fix: "FTBFS on arm64", thanks to Edmund Grimley Evans (Closes:
+    #787341).
+
+ -- David Bremner <bremner@debian.org>  Mon, 01 Jun 2015 21:58:54 +0200
+
 notmuch (0.20-1) unstable; urgency=medium
 
   * New upstream release

diff --git a/test/T070-insert.sh b/test/T070-insert.sh
index 168345c9897b085de2399a09b824e8796604aa98..74f1955203f0f5cedcf0be633bcef440eeb5aa51 100755 (executable)
--- a/test/T070-insert.sh
+++ b/test/T070-insert.sh
@@ -191,7 +191,6 @@ for code in OUT_OF_MEMORY XAPIAN_EXCEPTION FILE_NOT_EMAIL \
     READ_ONLY_DATABASE UPGRADE_REQUIRED; do
 gen_insert_msg
 cat <<EOF > index-file-$code.gdb
-file notmuch
 set breakpoint pending on
 break notmuch_database_add_message
 commands

diff --git a/version b/version
index 9f4eca259f6d8bf44a1d6f0850fe656d2fd54987..847e9aef6d1fc26617ae67d57b2cf5f920bd5efe 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.20
+0.20.1