Merge branch 'release'

3 files changed, 70 insertions, 2 deletions

diff --git a/NEWS b/NEWS
index da40354a..0d284b11 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Notmuch 0.39 (UNRELEASED)
+Notmuch 0.39 (2025-03-15)
 =========================
 
 General
@@ -9,11 +9,57 @@ non-matched authors when showing threads. See
 `search.authors_separator` and `search.authors_matched_separator` in
 notmuch-config(1).
 
+Library
+-------
+
+Make the s-expression query parser thread-safe.
+
 Emacs
 -----
 
+The new variable `untrusted-content` is now (conditionally) set in
+relevant modes.
+
+Add `notmuch-mua-subject-regexp` to help avoid sending erroneous
+subjects.
+
+Allow toggling display of excluded messages.
+
+Fix for text/calendar display. Fix for subject sanitizing in tree
+mode. Fix for hl-line location in search and tree mode. Fix for
+interaction with which-func-mode and imenu. Fix for saving hidden
+headers in drafts.
+
 Support for Emacs older than 27.1 is deprecated with this release.
 
+Legacy Python Bindings
+----------------------
+
+The legacy python bindings previously in `bindings/python` are no
+longer supported. These bindings have been deprecated since 2020. As
+of this release they are no longer built or tested, and patches for
+them will no longer be accepted. They have been moved to `contrib` to
+smooth the transition. Thanks very much to Sebastian Spaeth and all of
+the other contributors to these bindings over the years.
+
+Python Bindings
+---------------
+
+Adapt python-cffi version handling to stricter version constraints in
+setuptools.
+
+Fix iterator related segfaults.
+
+Ruby Bindings
+-------------
+
+Fix for warnings about "undefining the allocator of T_DATA".
+
+Test Suite
+----------
+
+Adapt test suite for changes in Emacs 30.1 and GnuPG 2.4 series.
+
 Notmuch 0.38.3 (2024-03-09)
 ===========================
 
diff --git a/debian/changelog b/debian/changelog
index b84bfed6..ef835166 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+notmuch (0.39-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Legacy python bindings (package python3-notmuch) are no longer
+    built. Consider switching to python3-notmuch2.
+
+ -- David Bremner <bremner@debian.org>  Sat, 15 Mar 2025 07:03:50 -0300
+
 notmuch (0.39~rc3-1) experimental; urgency=medium
 
   * New upstream pre-release
@@ -37,6 +45,20 @@ notmuch (0.39~rc0-1) experimental; urgency=medium
 
  -- David Bremner <bremner@debian.org>  Sat, 22 Feb 2025 08:12:33 -0400
 
+notmuch (0.38.3-5) unstable; urgency=medium
+
+  * Bug fix: "test suite regressions with fixed GnuPG", thanks to
+    Daniel Kahn Gillmor (Closes: #1098995).
+
+ -- David Bremner <bremner@debian.org>  Fri, 28 Feb 2025 16:24:35 -0500
+
+notmuch (0.38.3-4) unstable; urgency=medium
+
+  * Bug fix: "FTBFS: 3 tests fail against Emacs 30.1", thanks to Sean
+    Whitton (Closes: #1098852). Cherry-pick upstream commit e3d4721b1.
+
+ -- David Bremner <bremner@debian.org>  Tue, 25 Feb 2025 16:51:36 -0400
+
 notmuch (0.38.3-3) unstable; urgency=medium
 
   [ James McCoy ]
diff --git a/version.txt b/version.txt
index edb4df4e..751b1ea0 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.39~rc3
+0.39