Merge branch 'release'

diff --git a/NEWS b/NEWS
index 556172bb4e9b61142d6331063fc5039f864d806e..0d8b930f10a19d6b0f6b35ff92deabe15e826a26 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Notmuch 0.30 (2020-06-01)
+Notmuch 0.30 (2020-07-10)
 =========================
 
 S/MIME

diff --git a/bindings/python-cffi/version b/bindings/python-cffi/version
index db90aec257f2f398a035dfd8bff02093c806158f..f7c6c31b626ca788a98fb509eb9eaabda723358f 100644 (file)
--- a/bindings/python-cffi/version
+++ b/bindings/python-cffi/version
@@ -1 +1 @@
-0.30~rc3
+0.30

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index a25b1d7d8617d90fa5426977e95e7013390c0c2b..36b4cfca6289cff3807bb58cf769e100a0045187 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.30~rc3'
+__VERSION__ = '0.30'
 SOVERSION = '5'

diff --git a/debian/changelog b/debian/changelog
index db853fa0b8d8c802230ae04ae7da85d9bc8e2a5e..b6117ec34425d6daf8a89eacc41d1ee64a24770f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+notmuch (0.30-1) unstable; urgency=medium
+
+  * New upstream release
+  * Improvements to S/MIME handling
+  * Repairs to some mangled MIME messages
+  * New python bindings (notmuch2) compatible with current python 3
+
+ -- David Bremner <bremner@debian.org>  Fri, 10 Jul 2020 22:24:14 -0300
+
 notmuch (0.30~rc3-1) experimental; urgency=medium
 
   * New upstream release candidate

diff --git a/version b/version
index db90aec257f2f398a035dfd8bff02093c806158f..f7c6c31b626ca788a98fb509eb9eaabda723358f 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.30~rc3
+0.30