From 5df1b1bb81b1983578e636ac62000e280d241139 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 31 May 2015 18:56:10 +0200 Subject: [PATCH 1/4] test: remove redundant 'file' command from gdb scripts. Quoting Debian bug 787341 It failed to build on arm64: the last ten tests in T070-insert failed. What's happening here is that GDB is segfaulting in response to the "file" command. GDB on arm64 can be a bit buggy. However, the "file" command is redundant here as GDB has already got the file from the --args on the command line. --- test/T070-insert.sh | 1 - 1 file changed, 1 deletion(-) 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 < index-file-$code.gdb -file notmuch set breakpoint pending on break notmuch_database_add_message commands From dc840338b21cb041cb781d34b6b7f20f7e8fecb0 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Mon, 1 Jun 2015 21:47:35 +0200 Subject: [PATCH 2/4] version: bump to 20.1 --- bindings/python/notmuch/version.py | 2 +- version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/version b/version index 9f4eca25..847e9aef 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.20 +0.20.1 From d22df9503b0fcf06b41b8b6bcb75207b549f08d7 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Mon, 1 Jun 2015 22:00:11 +0200 Subject: [PATCH 3/4] debian: change stanza for 0.20.1 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) 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 Mon, 01 Jun 2015 21:58:54 +0200 + notmuch (0.20-1) unstable; urgency=medium * New upstream release From 0291ec71b6e0a5f1b3f335b4a3277a1dcdecd295 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Tue, 2 Jun 2015 06:34:48 +0200 Subject: [PATCH 4/4] NEWS: missing NEWS for 20.1 Embarrassingly, these were not included in the actual 20.1 release --- NEWS | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/NEWS b/NEWS index 463b6b62..845dade4 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) =========================