Merge branch 'release'

diff --git a/NEWS b/NEWS
index 8c578f0e92f084cfef630d566dbdf9453f248d81..c18d63d3212aaba4873e12c0d02780f63b5c4ec9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Notmuch 0.36 (UNRELEASED)
+Notmuch 0.36 (2022-04-25)
 =========================
 
 Library

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index 833e05d6b028c7b0061bee8cd807219c8cd10b2a..591446261914ff51e021bce490219a4e830d2bd8 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.36~rc1'
+__VERSION__ = '0.36'
 SOVERSION = '5'

diff --git a/debian/changelog b/debian/changelog
index 182789f43037b214d660ede24a3ef9401eca6589..1c6f3586bf9c44d5d5489d9bc74a27da749f4352 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+notmuch (0.36-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- David Bremner <bremner@debian.org>  Mon, 25 Apr 2022 08:47:41 -0300
+
 notmuch (0.36~rc1-1) experimental; urgency=medium
 
   * New upstream release candidate

diff --git a/version.txt b/version.txt
index db0791cce436b994d2b7c50681b7baa1133fbaae..2037dfa6c43dd66de1007cff562b14ebed056c1a 100644 (file)
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.36~rc1
+0.36