Merge branch 'release'

20.1 plus NEWS fixup
2024-11-22 10:58:10 +01:00 · 2015-06-02 06:37:59 +02:00 · 2015-06-02 06:37:59 +02:00 · 243d7e30dc
commit 243d7e30dc
parent 447ad6b498 0291ec71b6
5 changed files with 17 additions and 3 deletions
--- a/8
+++ b/8
@ -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)
 =========================

--- 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'
--- 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
--- 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
--- a/2
+++ b/2
@ -1 +1 @@
-0.20
+0.20.1
 @ -1 +1 @@
 .20
 .20.1