X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile.local;h=383e0cbabc8bb4b5895ef9f05238351c6c9139ca;hp=eb5995651cc31c2dd67448aab2921f92b6bc5268;hb=1f82039e0da1adf078559ef9bf80e2b47858a607;hpb=01f9c71312937011c4474688d3d1dd64c14731fb diff --git a/Makefile.local b/Makefile.local index eb599565..383e0cba 100644 --- a/Makefile.local +++ b/Makefile.local @@ -42,7 +42,7 @@ $(TAR_FILE): $(SHA256_FILE): $(TAR_FILE) sha256sum $^ | gpg --clear-sign --output $@ - -$(GPG_FILE): $(TAR_FILE) +$(DETACHED_SIG_FILE): $(TAR_FILE) gpg --armor --detach-sign $^ .PHONY: dist @@ -68,16 +68,16 @@ release: verify-source-tree-and-version $(MAKE) VERSION=$(VERSION) clean $(MAKE) VERSION=$(VERSION) test git tag -s -m "$(PACKAGE) $(VERSION) release" $(UPSTREAM_TAG) - $(MAKE) VERSION=$(VERSION) $(SHA256_FILE) $(GPG_FILE) + $(MAKE) VERSION=$(VERSION) $(SHA256_FILE) $(DETACHED_SIG_FILE) ln -sf $(TAR_FILE) $(DEB_TAR_FILE) 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) $(SHA256_FILE) $(GPG_FILE) releases + mv $(TAR_FILE) $(SHA256_FILE) $(DETACHED_SIG_FILE) releases $(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce ifeq ($(REALLY_UPLOAD),yes) git push origin $(VERSION) $(DEB_TAG) release pristine-tar - cd releases && scp $(TAR_FILE) $(SHA256_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR) + cd releases && scp $(TAR_FILE) $(SHA256_FILE) $(DETACHED_SIG_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." @@ -121,7 +121,7 @@ release-message: @echo -n " " @cat releases/$(SHA256_FILE) @echo "" - @echo " $(RELEASE_URL)/$(GPG_FILE)" + @echo " $(RELEASE_URL)/$(DETACHED_SIG_FILE)" @echo " (signed by `getent passwd "$$USER" | cut -d: -f 5 | cut -d, -f 1`)" @echo "" @echo "What's new in notmuch $(VERSION)"