mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-21 18:38:08 +01:00
Merge branch 'release'
final 0.24 release
This commit is contained in:
commit
c0c5645538
5 changed files with 22 additions and 7 deletions
|
@ -70,11 +70,11 @@ release: verify-source-tree-and-version
|
||||||
pristine-tar commit $(DEB_TAR_FILE) $(UPSTREAM_TAG)
|
pristine-tar commit $(DEB_TAR_FILE) $(UPSTREAM_TAG)
|
||||||
git tag -s -m "$(PACKAGE) Debian $(VERSION)-1 upload (same as $(VERSION))" $(DEB_TAG)
|
git tag -s -m "$(PACKAGE) Debian $(VERSION)-1 upload (same as $(VERSION))" $(DEB_TAG)
|
||||||
mkdir -p releases
|
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
|
$(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce
|
||||||
ifeq ($(REALLY_UPLOAD),yes)
|
ifeq ($(REALLY_UPLOAD),yes)
|
||||||
git push origin $(VERSION)
|
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)"
|
ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-* ; ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(TAR_FILE)"
|
||||||
endif
|
endif
|
||||||
@echo "Please send a release announcement using $(PACKAGE)-$(VERSION).announce as a template."
|
@echo "Please send a release announcement using $(PACKAGE)-$(VERSION).announce as a template."
|
||||||
|
@ -114,9 +114,9 @@ release-message:
|
||||||
@echo ""
|
@echo ""
|
||||||
@echo "Which can be verified with:"
|
@echo "Which can be verified with:"
|
||||||
@echo ""
|
@echo ""
|
||||||
@echo " $(RELEASE_URL)/$(SHA1_FILE)"
|
@echo " $(RELEASE_URL)/$(SHA256_FILE)"
|
||||||
@echo -n " "
|
@echo -n " "
|
||||||
@cat releases/$(SHA1_FILE)
|
@cat releases/$(SHA256_FILE)
|
||||||
@echo ""
|
@echo ""
|
||||||
@echo " $(RELEASE_URL)/$(GPG_FILE)"
|
@echo " $(RELEASE_URL)/$(GPG_FILE)"
|
||||||
@echo " (signed by `getent passwd "$$USER" | cut -d: -f 5 | cut -d, -f 1`)"
|
@echo " (signed by `getent passwd "$$USER" | cut -d: -f 5 | cut -d, -f 1`)"
|
||||||
|
|
2
NEWS
2
NEWS
|
@ -1,4 +1,4 @@
|
||||||
Notmuch 0.24 (UNRELEASED)
|
Notmuch 0.24 (2017-03-12)
|
||||||
=========================
|
=========================
|
||||||
|
|
||||||
General
|
General
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
# this file should be kept in sync with ../../../version
|
# this file should be kept in sync with ../../../version
|
||||||
__VERSION__ = '0.24~rc1'
|
__VERSION__ = '0.24'
|
||||||
SOVERSION = '4'
|
SOVERSION = '4'
|
||||||
|
|
15
debian/changelog
vendored
15
debian/changelog
vendored
|
@ -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
|
notmuch (0.24~rc1-1) experimental; urgency=medium
|
||||||
|
|
||||||
* New upstream release candidate
|
* New upstream release candidate
|
||||||
|
|
2
version
2
version
|
@ -1 +1 @@
|
||||||
0.24~rc1
|
0.24
|
||||||
|
|
Loading…
Reference in a new issue