Explicitly use my GPG key for signing.

diff --git a/Makefile.am b/Makefile.am
index 39ea04d..77c9d61 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,6 +10,7 @@ snapshot:
        test -d "$(srcdir)/.git" && distdir=$$distdir-`cd "$(srcdir)" && git-rev-parse HEAD | cut -c 1-6`; \
        $(MAKE) $(AM_MAKEFLAGS) distdir="$$distdir" dist
 
+GPGKEY=6FF7C1A8
 USERNAME=$$USER
 RELEASE_OR_SNAPSHOT = $$(if test "x$(CAIRO_VERSION_MINOR)" = "x$$(echo "$(CAIRO_VERSION_MINOR)/2*2" | bc)" ; then echo release; else echo snapshot; fi)
 RELEASE_CAIRO_HOST =   $(USERNAME)@cairographics.org
@@ -66,22 +67,24 @@ ensure-prev:
        @if [[ "$(PREV)" == "" ]]; then                                                 \
                echo ""                                                           &&    \
                echo "You must set the PREV variable on the make command line to" &&    \
-               echo "the git tag of the last release."                           &&    \
+               echo "the last version."                                  &&    \
                echo ""                                                           &&    \
                echo "For example:"                                               &&    \
-               echo "      make PREV=pixman-0.7.3"                               &&    \
+               echo "      make PREV=0.7.3"                              &&    \
                echo ""                                                           &&    \
                false;                                                                  \
        fi
 
 release-check: ensure-prev release-verify-newer release-remove-old distcheck
 
+release-tag:
+       git-tag -u $(GPGKEY) -m "$(PACKAGE) $(VERSION) release" $(PACKAGE)-$(VERSION)
+
 release-upload: release-check $(tar_gz) $(tar_bz2) $(sha1_tgz) $(gpg_file)
        mkdir -p releases
        scp $(tar_gz) $(sha1_tgz) $(gpg_file) $(RELEASE_CAIRO_HOST):$(RELEASE_CAIRO_DIR)
        scp $(tar_gz) $(tar_bz2) $(RELEASE_XORG_HOST):$(RELEASE_XORG_DIR)
        ssh $(RELEASE_CAIRO_HOST) "rm -f $(RELEASE_CAIRO_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(tar_gz) $(RELEASE_CAIRO_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
-       git-tag -s -m "$(PACKAGE) $(VERSION) release" $(PACKAGE)-$(VERSION)
 
 release-publish-message: $(sha1_tgz) $(md5_tgz) $(sha1_tbz2) $(md5_tbz2) ensure-prev
        @echo "Please follow the instructions in RELEASING to push stuff out and"
@@ -122,6 +125,6 @@ release-publish-message: $(sha1_tgz) $(md5_tgz) $(sha1_tbz2) $(md5_tbz2) ensure-
        @echo "============================== CUT HERE =============================="
        @echo ""
 
-release-publish: release-upload release-publish-message
+release-publish: release-upload release-tag release-publish-message
 
-.PHONY: release-upload release-publish release-publish-message
+.PHONY: release-upload release-publish release-publish-message release-tag