Merge tag 'debian/0.34.2-1'

notmuch release 0.34.2-1 for unstable (sid) [dgit]

[dgit distro=debian no-split --quilt=linear]

diff --git a/NEWS b/NEWS
index 5707e9b02f62377283b1a24b6398ab3252821a86..27e431561717e169ea858295a56251759a5cc5de 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,25 @@
+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.
+
+Fix some unprintable exception objects.
+
 Notmuch 0.34.1 (2021-11-03)
 ===========================
 

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index 701d61d5c67cd92203a2ea4df40b72f6554065b3..7a872f5f2077a1c237bd8a351eb8b9510217f8fe 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.34.1'
+__VERSION__ = '0.34.2'
 SOVERSION = '5'

diff --git a/debian/changelog b/debian/changelog
index aa84b3f9c254cbd226561697e99e4372c31f4868..be7bc3979bae3a4173ca0ed597625a504721939e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+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 <bremner@debian.org>  Fri, 10 Dec 2021 09:35:43 -0400
+
 notmuch (0.34.1-1) unstable; urgency=medium
 
   * New upstream bugfix release. Fixes a memory deallocation error in

diff --git a/debian/control b/debian/control
index 8a2e29dd585692b5c69aa4e35e00360b528afbcb..9872d60240ed3d479b4703a7f4323c89d3f256b3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -23,13 +23,13 @@ Build-Depends:
  gnupg <!nocheck>,
  gpgsm <!nocheck>,
  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,

diff --git a/version.txt b/version.txt
index cd46610fe44751b8b112db3780fe4fd30b9dbff0..3f8003cd4c4fdbfa727f3764b19cdf7d8ac046db 100644 (file)
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.34.1
+0.34.2