Merge branch 'release'

diff --git a/NEWS b/NEWS
index 586bc97d4eaea1b89bf0f6c1f85c54b47f20acd4..2ce632f00d0b8ad99e9079fa21b51ff2a79af2e8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Notmuch 0.33 (UNRELEASED)
+Notmuch 0.33 (2021-09-03)
 =========================
 
 Library
@@ -28,11 +28,37 @@ previous behaviour of using notmuch to send mail by default, customize
 
 Improve the display of messages from long threads in unthreaded mode.
 
+Prefer email addresses over User ID when showing valid signatures.
+
+Define a new face `notmuch-jump-key`.
+
+New commands in notmuch-tree view: `notmuch-tree-filter` and `notmuch-tree-filter-by-tag`.
+
+Honour `notmuch-show-text/html-blocked-images` when using `w3m` to
+render html.
+
+Support toggling sort order in notmuch-tree mode.
+
+Ruby
+----
+
+Memory management of allocated notmuch objects (database, messages,
+etc...) is now done via the Ruby GC. This removes all constraints on
+the order of object destruction.  Database close and destroy are
+split, following an old library API change.
+
 Vim
 ---
 
 Respect excluded tags when showing a thread.
 
+Documentation
+-------------
+
+Fix doc build for Sphinx 4.0.
+
+Improve the markup and linking of the documentation.
+
 Notmuch 0.32.3 (2021-08-17)
 ===========================
 

diff --git a/bindings/python-cffi/version.txt b/bindings/python-cffi/version.txt
index 1a71eb8286bc5a1a36884c520051fa1885e3d6ee..94b357edfe3177640d1f0327b6360ac35e796253 100644 (file)
--- a/bindings/python-cffi/version.txt
+++ b/bindings/python-cffi/version.txt
@@ -1 +1 @@
-0.33~rc0
+0.33

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index 56eeaf8f0bc78b35e230117e7f599cf1947d0c48..eaa3fce7180e437060731eca2c2d6ffcb992e4c6 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.33~rc0'
+__VERSION__ = '0.33'
 SOVERSION = '5'

diff --git a/debian/changelog b/debian/changelog
index a13633b2ce3276e829e162eb85db879dbb288ced..12d93caac69f2d2144a061d14a275aebbaff4bd4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+notmuch (0.33-1) unstable; urgency=medium
+
+  * New upstream release
+  * See /usr/share/doc/notmuch/NEWS.gz for user visible changes.
+
+ -- David Bremner <bremner@debian.org>  Fri, 03 Sep 2021 12:24:41 -0700
+
 notmuch (0.33~rc0-1) experimental; urgency=medium
 
   * New upstream release candidate

diff --git a/debian/notmuch-emacs.maintscript b/debian/notmuch-emacs.maintscript
index 6f93feb7b3a299e49eb1f0d1994874ef5a0884f9..8e3004ecc2440267b2dd0c082b27672fff9fc1a7 100644 (file)
--- a/debian/notmuch-emacs.maintscript
+++ b/debian/notmuch-emacs.maintscript
@@ -1 +1 @@
-rm_conffile /etc/emacs/site-start.d/50notmuch.el
+rm_conffile /etc/emacs/site-start.d/50notmuch.el 0.33-1~

diff --git a/debian/notmuch.maintscript b/debian/notmuch.maintscript
index 6f93feb7b3a299e49eb1f0d1994874ef5a0884f9..8e3004ecc2440267b2dd0c082b27672fff9fc1a7 100644 (file)
--- a/debian/notmuch.maintscript
+++ b/debian/notmuch.maintscript
@@ -1 +1 @@
-rm_conffile /etc/emacs/site-start.d/50notmuch.el
+rm_conffile /etc/emacs/site-start.d/50notmuch.el 0.33-1~

diff --git a/version.txt b/version.txt
index 1a71eb8286bc5a1a36884c520051fa1885e3d6ee..94b357edfe3177640d1f0327b6360ac35e796253 100644 (file)
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.33~rc0
+0.33