Merge branch 'release'

final 0.24 release

diff --git a/Makefile.local b/Makefile.local
index d2ef3e080b7b266f46d894a59c6fb61c04124e5c..e75b6eae040d41b8195a59447fadfb0a03c41f9d 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -70,11 +70,11 @@ release: verify-source-tree-and-version
        pristine-tar commit $(DEB_TAR_FILE) $(UPSTREAM_TAG)
        git tag -s -m "$(PACKAGE) Debian $(VERSION)-1 upload (same as $(VERSION))" $(DEB_TAG)
        mkdir -p releases
-       mv $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) releases
+       mv $(TAR_FILE) $(SHA256_FILE) $(GPG_FILE) releases
        $(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce
 ifeq ($(REALLY_UPLOAD),yes)
        git push origin $(VERSION)
-       cd releases && scp $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
+       cd releases && scp $(TAR_FILE) $(SHA256_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
        ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-* ; ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(TAR_FILE)"
 endif
        @echo "Please send a release announcement using $(PACKAGE)-$(VERSION).announce as a template."
@@ -114,9 +114,9 @@ release-message:
        @echo ""
        @echo "Which can be verified with:"
        @echo ""
-       @echo "  $(RELEASE_URL)/$(SHA1_FILE)"
+       @echo "  $(RELEASE_URL)/$(SHA256_FILE)"
        @echo -n "  "
-       @cat releases/$(SHA1_FILE)
+       @cat releases/$(SHA256_FILE)
        @echo ""
        @echo "  $(RELEASE_URL)/$(GPG_FILE)"
        @echo "  (signed by `getent passwd "$$USER" | cut -d: -f 5 | cut -d, -f 1`)"

diff --git a/NEWS b/NEWS
index 5cf73ef2e81e26429aa65b6e390ba4c28faaaa02..3756590e8d8bfed1455483561ee646a8e24457c7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Notmuch 0.24 (UNRELEASED)
+Notmuch 0.24 (2017-03-12)
 =========================
 
 General

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index 7aa101d3bd96c840a838d1f2f201af07da8b4042..1bbd94646c0f61da2f9818a2b237000369b80bfc 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.24~rc1'
+__VERSION__ = '0.24'
 SOVERSION = '4'

diff --git a/debian/changelog b/debian/changelog
index b8a0bf9d7c0abef1804bb9d31ad493ef2423e82a..520a1e7a59e85e1de395fa783221b4ce8c065a04 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+notmuch (0.24-1) experimental; urgency=medium
+
+  * New upstream release
+    - regexp search for from: and subject:
+    - Emacs interface improvements:
+      - draft handling
+      - don't automatically expand application/*
+      - jump (shortcut) menu for tagging.
+      - fold long headers when sending
+    - library improvements
+      - catch some stray DatabaseModifiedErrors
+      - make exclude handling non-destructive.
+
+ -- David Bremner <bremner@debian.org>  Sun, 12 Mar 2017 22:14:25 -0300
+
 notmuch (0.24~rc1-1) experimental; urgency=medium
 
   * New upstream release candidate

diff --git a/version b/version
index 1a46dd0a67ee8319ecd928357ff94e1f6e557903..fd137eb17ebf8ef31a21dc69395943c3c43f3e54 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.24~rc1
+0.24