Merge branch 'release'

diff --git a/NEWS b/NEWS
index cb6e21cd1b0c44971707c1e3219259fa8525883f..ab661d4df0eb143a136a38952e800e44ff45e02b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,37 @@ Ruby Bindings
 
 Add support for `notmuch_database_get_all_tags`
 
+Notmuch 0.22.1 (2016-07-19)
+===========================
+
+Library
+-------
+
+Correct the definition of `LIBNOTMUCH_CHECK_VERSION`.
+
+Document the (lack of) operations permitted on a closed database.
+
+Test Suite
+----------
+
+Fix race condition in dump / restore tests.
+
+Notmuch-Mutt
+------------
+
+Use `env` to locate perl.
+
+Emacs
+-----
+
+Tell `message-mode` mode that outgoing messages are mail
+
+  This makes message-mode configuration behave more predictably.
+
+Respect charset of MIME parts when reading them
+
+  Fix previous assumption that everyone uses UTF-8.
+
 Notmuch 0.22 (2016-04-26)
 =========================
 

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index c1d472bea1c1503651ec16912adef9a50107100d..0dcbb4e3f96e1d6eb641f9be96f8bf6775927e5e 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.22'
+__VERSION__ = '0.22.1'
 SOVERSION = '4'

diff --git a/debian/changelog b/debian/changelog
index fdb14edd20873d38a3d26b9ed4b0f866d57f292a..bac4fcb976c516aa926ff436f528bdf9ab5da54b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+notmuch (0.22.1-2) unstable; urgency=medium
+
+  * Add explicit build-depends on gnupg, for the test suite.
+
+ -- David Bremner <bremner@debian.org>  Tue, 19 Jul 2016 08:50:13 -0300
+
+notmuch (0.22.1-1) unstable; urgency=medium
+
+  * Correct the definition of `LIBNOTMUCH_CHECK_VERSION`.
+  * Document the (lack of) operations permitted on a closed database
+    (Closes: #826843).
+  * Fix race condition in dump / restore tests.
+  * [notmuch-emacs] Tell `message-mode` mode that outgoing messages are mail
+  * [notmuch-emacs] Respect charset of MIME parts when reading them
+
+ -- David Bremner <bremner@debian.org>  Tue, 19 Jul 2016 06:42:09 -0300
+
+notmuch (0.22.1~rc0-1) experimental; urgency=medium
+
+  * release candidate for bugfix release
+
+ -- David Bremner <bremner@debian.org>  Thu, 30 Jun 2016 21:28:13 +0200
+
 notmuch (0.22-1) unstable; urgency=medium
 
   * New upstream release.  See /usr/share/doc/notmuch/NEWS for new

diff --git a/debian/control b/debian/control
index d846119b2649986761b50083c0dd2f152291b9de..4027a79b63b355c7fbe712b1fa87ddf120f94d7c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Build-Depends:
  gdb [!s390x !ia64 !armel !ppc64el !mips !mipsel !mips64el],
  dtach (>= 0.8),
  gpgsm <!nocheck>,
+ gnupg <!nocheck>,
  bash-completion (>=1.9.0~)
 Standards-Version: 3.9.6
 Homepage: https://notmuchmail.org/

diff --git a/version b/version
index e3462940604b0ed68ebec6603d5b0a0cabd3c4b3..a723ece79bca4c8caaf06aedfc39095c8bad643e 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.22
+0.22.1