diff options
| author | David Bremner <david@tethera.net> | 2017-03-12 22:43:11 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-03-12 22:43:11 -0300 |
| commit | c0c5645538d9dda84657602ee4189f4ff3ca1aeb (patch) | |
| tree | be88419700cdf5144311ae030a755126ea9daf14 | |
| parent | 936c35da86aebf76b14f4ba198f760403455cfe0 (diff) | |
| parent | e60b44ecf8bd5934959727496c7ef3016ff80cf6 (diff) | |
Merge branch 'release'
final 0.24 release
| -rw-r--r-- | Makefile.local | 8 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | bindings/python/notmuch/version.py | 2 | ||||
| -rw-r--r-- | debian/changelog | 15 | ||||
| -rw-r--r-- | version | 2 |
5 files changed, 22 insertions, 7 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`)" @@ -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 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/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 <bremner@debian.org> Sun, 12 Mar 2017 22:14:25 -0300 + notmuch (0.24~rc1-1) experimental; urgency=medium * New upstream release candidate @@ -1 +1 @@ -0.24~rc1 +0.24 |