From: David Bremner <david@tethera.net>
Date: Tue, 2 Jun 2015 04:37:59 +0000 (+0200)
Subject: Merge branch 'release'
X-Git-Tag: 0.21_rc0~102
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=243d7e30dcd80041760307d8d0d2a1839f36eca2;hp=447ad6b4984c71881b7f97641c77f0a39b71a991

Merge branch 'release'

20.1 plus NEWS fixup
---

diff --git a/NEWS b/NEWS
index 64388cd3..03254d59 100644
--- 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 55014249..aa6fe210 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.20'
+__VERSION__ = '0.20.1'
 SOVERSION = '4'
diff --git a/debian/changelog b/debian/changelog
index 9300dddc..f338ddfb 100644
--- 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 168345c9..74f19552 100755
--- 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 9f4eca25..847e9aef 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.20
+0.20.1