From 339dfd424142a745e09d07efd3a7f04de12e1b16 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 12 Mar 2017 22:08:54 -0300 Subject: [PATCH 1/4] version: bump to 0.24 --- bindings/python/notmuch/version.py | 2 +- version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py index 7aa101d3..1bbd9464 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.24~rc1' +__VERSION__ = '0.24' SOVERSION = '4' diff --git a/version b/version index 1a46dd0a..fd137eb1 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.24~rc1 +0.24 From 7e82eea6a5ee60eccedfa5269d63dae14097162b Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 12 Mar 2017 22:10:36 -0300 Subject: [PATCH 2/4] NEWS: set release date --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 5cf73ef2..3756590e 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -Notmuch 0.24 (UNRELEASED) +Notmuch 0.24 (2017-03-12) ========================= General From 4a1af272f094e8674e9daccd475ca19bb52b4bd0 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 12 Mar 2017 22:15:05 -0300 Subject: [PATCH 3/4] debian: changelog stanza for 0.24-1 --- debian/changelog | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/debian/changelog b/debian/changelog index b8a0bf9d..520a1e7a 100644 --- 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 Sun, 12 Mar 2017 22:14:25 -0300 + notmuch (0.24~rc1-1) experimental; urgency=medium * New upstream release candidate From e60b44ecf8bd5934959727496c7ef3016ff80cf6 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 12 Mar 2017 22:31:16 -0300 Subject: [PATCH 4/4] build: replace remaining uses of SHA1_FILE oops. If only there was some editor facility that allowed replacing all instances of a string. --- Makefile.local | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.local b/Makefile.local index d2ef3e08..e75b6eae 100644 --- 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`)"