Merge branch 'release'

diff --combined NEWS
index cb6e21cd1b0c44971707c1e3219259fa8525883f,3db6aba9caa823a5bbdee6ec2d0f9dccd8b02329..ab661d4df0eb143a136a38952e800e44ff45e02b
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,11 -1,34 +1,42 @@@
 +Notmuch 0.23 (UNRELEASED)
 +=========================
 +
 +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)
  =========================
  
@@@ -2361,7 -2384,7 +2392,7 @@@ Ruby bindings are now much more complet
  
  Python bindings have been updated and extended
  
 -  (docs online at http://packages.python.org/notmuch/)
 +  (docs online at https://notmuch.readthedocs.io/)
  
    New bindings:
  

diff --combined debian/control
index d846119b2649986761b50083c0dd2f152291b9de,2cd2421394294fbfbbcaf9ad229a3bac1e06e731..4027a79b63b355c7fbe712b1fa87ddf120f94d7c
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -24,11 -24,12 +24,12 @@@ 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: http://notmuchmail.org/
 +Homepage: https://notmuchmail.org/
  Vcs-Git: git://notmuchmail.org/git/notmuch
 -Vcs-Browser: http://git.notmuchmail.org/git/notmuch
 +Vcs-Browser: https://git.notmuchmail.org/git/notmuch
  
  Package: notmuch
  Architecture: any