build: Rename GPG_FILE to DETACHED_SIG_FILE
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 23 Mar 2019 12:35:44 +0000 (13:35 +0100)
committerDavid Bremner <david@tethera.net>
Wed, 27 Mar 2019 20:54:12 +0000 (17:54 -0300)
This is just a semantic cleanup -- we have multiple files that are
OpenPGP signatures.  And while we're probably making signatures with
GnuPG, they can be verified with any OpenPGP implementation, so "GPG_"
is arguably both not specific enough, and overly-specific.

Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Makefile.global
Makefile.local

index 27c82433770fdbc67e10ce5582cf948a871a4e82..b54ba9dd0bcc53b69ac5e92bfe5f865e85fb681a 100644 (file)
@@ -44,7 +44,7 @@ TAR_FILE=$(PACKAGE)-$(VERSION).tar.gz
 ELPA_FILE:=$(PACKAGE)-emacs-$(ELPA_VERSION).tar
 DEB_TAR_FILE=$(PACKAGE)_$(VERSION).orig.tar.gz
 SHA256_FILE=$(TAR_FILE).sha256.asc
-GPG_FILE=$(TAR_FILE).asc
+DETACHED_SIG_FILE=$(TAR_FILE).asc
 
 PV_FILE=bindings/python/notmuch/version.py
 
index eb5995651cc31c2dd67448aab2921f92b6bc5268..383e0cbabc8bb4b5895ef9f05238351c6c9139ca 100644 (file)
@@ -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)"