Merge branch 'release'

7 files changed, 87 insertions, 4 deletions

diff --git a/NEWS b/NEWS
index 644453f2..00f4fe47 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,75 @@
-Notmuch 0.38 (UNRELEASED)
+Notmuch 0.38 (2023-09-12)
 =========================
 
+General
+-------
+
+Support relative lastmod queries (see notmuch-sexp-queries(7) and
+notmuch-search-terms(7) for details).
+
+Support indexing of designated attachments as text (see
+notmuch-config(1) for details).
+
+CLI
+---
+
+Add options --offset and --limit to notmuch-show(1).
+
+Emacs
+-----
+
+New commands notmuch-search-edit-search and notmuch-tree-edit-search.
+
+Introduce notmuch-tree-outline-mode.
+
+Some compatibility fixes for Emacs 29. At least one issue (hiding
+images) remains in 0.38.
+
+Support completion when piping to external command.
+
+Fix regression in updating tag display introduced by 0.37.
+
+Library
+-------
+
+Fix bug creating database when database.path is not set.
+
+Incremental performance improvements for message deletion.
+
+Catch Xapian exceptions when deleting messages.
+
+Sync removed message properties to the database.
+
+Replace use of thread-unsafe Query::MatchAll in the infix query
+parser.
+
+Notmuch-Mutt
+------------
+
+Be more careful when clearing the results directory.
+
+Ruby
+----
+
+Use `database_open_with_config`, and provide compatible path search
+semantics.
+
+Bugfix for query.get_sort
+
+Test Suite
+----------
+
+Support testing installed version of notmuch.
+
+Adapt to some breaking changes in glib handling of init files.
+
+Replace OpenPGP key used in test suite.
+
+Performance Tests
+-----------------
+
+Update signatures for performance test corpus.
+
 Notmuch 0.37 (2022-08-21)
 =========================
 
diff --git a/bindings/Makefile.local b/bindings/Makefile.local
index 7b10af08..9875123a 100644
--- a/bindings/Makefile.local
+++ b/bindings/Makefile.local
@@ -34,3 +34,7 @@ CLEAN += $(patsubst %,$(dir)/ruby/%, \
 CLEAN += bindings/ruby/.vendorarchdir.time $(dir)/ruby.stamp
 
 CLEAN += bindings/python-cffi/build $(dir)/python-cffi.stamp
+CLEAN += bindings/python-cffi/__pycache__
+
+DISTCLEAN += bindings/python-cffi/_notmuch_config.py \
+	bindings/python-cffi/notmuch2.egg-info
diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index 8e62314e..c847a1a3 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.38~rc2'
+__VERSION__ = '0.38'
 SOVERSION = '5'
diff --git a/debian/changelog b/debian/changelog
index a3b0dcb2..a4363281 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+notmuch (0.38-1) unstable; urgency=medium
+
+  * New upstream release
+  * Bug fix: "FTBFS: 6 tests failed.", thanks to Aurelien Jarno (Closes:
+    #1051111).
+  * Run most of upstream test suite as autopkgtests
+
+ -- David Bremner <bremner@debian.org>  Tue, 12 Sep 2023 08:33:24 -0300
+
 notmuch (0.38~rc2-1) experimental; urgency=medium
 
   * New upstream release candidate
diff --git a/debian/rules b/debian/rules
index 8bf97439..a77ffa15 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,7 +29,6 @@ override_dh_auto_build:
 override_dh_auto_clean:
 	dh_auto_clean
 	PYBUILD_NAME=notmuch dh_auto_clean --buildsystem=pybuild --sourcedirectory bindings/python
-	PYBUILD_NAME=notmuch2 dh_auto_clean --buildsystem=pybuild --sourcedirectory bindings/python-cffi
 	dh_auto_clean --sourcedirectory bindings/ruby
 	$(MAKE) -C contrib/notmuch-mutt clean
 
diff --git a/doc/Makefile.local b/doc/Makefile.local
index 51c729cf..aafa77a0 100644
--- a/doc/Makefile.local
+++ b/doc/Makefile.local
@@ -159,3 +159,5 @@ $(dir)/config.dox: version.stamp
 CLEAN := $(CLEAN) $(DOCBUILDDIR) $(DOCBUILDDIR)/.roff.stamp $(DOCBUILDDIR)/.texi.stamp
 CLEAN := $(CLEAN) $(DOCBUILDDIR)/.html.stamp $(DOCBUILDDIR)/.info.stamp
 CLEAN := $(CLEAN) $(MAN_GZIP_FILES) $(MAN_ROFF_FILES) $(dir)/conf.pyc $(dir)/config.dox
+
+CLEAN := $(CLEAN) $(dir)/__pycache__
diff --git a/version.txt b/version.txt
index 2139400c..1cbc8125 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.38~rc2
+0.38