From: David Bremner <david@tethera.net>
Date: Fri, 30 Oct 2015 10:33:48 +0000 (-0300)
Subject: Merge tag '0.21'
X-Git-Tag: 0.22_rc0~112
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=ca076ce2736b5db2ec03afe1b0e09299b24f05ff;hp=10e933a3bb2aec6172b513944765ad5fd39919f2;p=notmuch

Merge tag '0.21'

notmuch 0.21 release
---

diff --git a/Makefile.local b/Makefile.local
index d58cea04..066ecf23 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -224,7 +224,7 @@ release-checks:
 .PHONY: verify-newer
 verify-newer:
 	@echo -n "Checking that no $(VERSION) release already exists..."
-	@wget -q -O /dev/null $(RELEASE_URL)/$(TAR_FILE) ; \
+	@wget -q --no-check-certificate -O /dev/null $(RELEASE_URL)/$(TAR_FILE) ; \
 	case $$? in \
           8) echo "Good." ;; \
           0) echo "Ouch."; \
diff --git a/NEWS b/NEWS
index b9df5f73..6681699d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Notmuch 0.21 (UNRELEASED)
+Notmuch 0.21 (2015-10-29)
 =========================
 
 General
@@ -82,6 +82,10 @@ New message composition mode: `notmuch-compose-mode`
   This is mainly to fix fcc handling, but may be useful for user
   customization as well.
 
+Allow filtering of search results in `notmuch-show`
+
+Add function to rerun current tree-view search in search mode
+
 Bug fix for replying to encrypted messages in `notmuch-tree` mode
 
 Allow saved searched to specify tree view rather than search view
diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index 2f641158..db9d0764 100644
--- 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.21~rc3'
+__VERSION__ = '0.21'
 SOVERSION = '4'
diff --git a/debian/changelog b/debian/changelog
index 864286c9..e6cfc7a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+notmuch (0.21-1) unstable; urgency=medium
+
+  * New upstream release. Highlights include
+    - revision tracking for metadata
+    - new features and bug fixes for emacs interface
+    See /usr/share/doc/notmuch/NEWS for more details.
+
+ -- David Bremner <bremner@debian.org>  Thu, 29 Oct 2015 20:04:42 -0300
+
 notmuch (0.21~rc3-3) experimental; urgency=medium
 
   * Build-conflict with gdb-minimal. gdb python scripts are needed for
diff --git a/version b/version
index 1c0caa1a..5320adc1 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.21~rc3
+0.21