From 49f8d051d1e515161d4b10272e97f588b04d442b Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 9 Dec 2021 08:44:22 -0400 Subject: [PATCH 1/5] NEWS: add NEWS for 0.34.2 --- NEWS | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/NEWS b/NEWS index 5707e9b0..6c39f65c 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,23 @@ +Notmuch 0.34.2 (2021-12-09) +=========================== + +Library +------- + +Fix a bug that wrongly resolved conflict between the `database_path` +parameter to `notmuch_database_open_with_config` and configuration +item `database.path` in favour of the latter. + +Python Bindings (notmuch2) +-------------------------- + +When building the documentation for the `notmuch2` python module, +import from the built module, not a system wide installed one. + +The notmuch2.Database constructor now uses the library function +`notmuch_database_open_with_config` to support the same configuration +and database location options as the library does. + Notmuch 0.34.1 (2021-11-03) =========================== From 05ee23ba42c93367de085709892721468651b2bd Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 9 Dec 2021 08:47:15 -0400 Subject: [PATCH 2/5] version: bump to 0.34.2 --- bindings/python-cffi/version.txt | 2 +- bindings/python/notmuch/version.py | 2 +- version.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bindings/python-cffi/version.txt b/bindings/python-cffi/version.txt index cd46610f..3f8003cd 100644 --- a/bindings/python-cffi/version.txt +++ b/bindings/python-cffi/version.txt @@ -1 +1 @@ -0.34.1 +0.34.2 diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py index 701d61d5..7a872f5f 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.34.1' +__VERSION__ = '0.34.2' SOVERSION = '5' diff --git a/version.txt b/version.txt index cd46610f..3f8003cd 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.34.1 +0.34.2 From b5eaa8ee83b7e6e54ab14cb5c13d6bc5721f522a Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 9 Dec 2021 08:49:46 -0400 Subject: [PATCH 3/5] debian: changelog for 0.34.2-1 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index aa84b3f9..b3c52a41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +notmuch (0.34.2-1) unstable; urgency=medium + + * New upstream bugfix with release, with fixes database location in + library and notmuch2 python module. + + -- David Bremner Thu, 09 Dec 2021 08:48:53 -0400 + notmuch (0.34.1-1) unstable; urgency=medium * New upstream bugfix release. Fixes a memory deallocation error in From a254a15861d3510adbe2897fed100a3c77642165 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 9 Dec 2021 08:54:15 -0400 Subject: [PATCH 4/5] NEWS: mention fix for unprintable python exception --- NEWS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS b/NEWS index 6c39f65c..27e43156 100644 --- a/NEWS +++ b/NEWS @@ -18,6 +18,8 @@ The notmuch2.Database constructor now uses the library function `notmuch_database_open_with_config` to support the same configuration and database location options as the library does. +Fix some unprintable exception objects. + Notmuch 0.34.1 (2021-11-03) =========================== From 2394ee6289a2fc2628f198b4a9920116148dd814 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 9 Dec 2021 21:26:39 -0400 Subject: [PATCH 5/5] debian: build only against default python version This problem will will be solved in the next release of dh-python, but the crude solution is needed for backports anyway. --- debian/changelog | 4 +++- debian/control | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index b3c52a41..be7bc397 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ notmuch (0.34.2-1) unstable; urgency=medium * New upstream bugfix with release, with fixes database location in library and notmuch2 python module. + * Build only against the default version of python, to avoid including + multiple .abi3.so files in python3-notmuch2 - -- David Bremner Thu, 09 Dec 2021 08:48:53 -0400 + -- David Bremner Fri, 10 Dec 2021 09:35:43 -0400 notmuch (0.34.1-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 8a2e29dd..9872d602 100644 --- a/debian/control +++ b/debian/control @@ -23,13 +23,13 @@ Build-Depends: gnupg , gpgsm , libgmime-3.0-dev (>= 3.0.3~), - libpython3-all-dev, + libpython3-dev, libsexp-dev, libtalloc-dev, libxapian-dev, libz-dev, pkg-config, - python3-all (>= 3.1.2-7~), + python3, python3-cffi, python3-pytest, python3-pytest-cov,