[cairo-commit] Branch '1.2' - 2 commits - Makefile.am

[Behdad Esfahbod]

 Makefile.am |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

New commits:
diff-tree 7cac87c8041f63fac2e0a2f5a29e36ed80d8d51a (from 953332d128120e7c4f4197390984be11a80a368b)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Nov 2 21:15:41 2006 -0500

    [Makefile.am] Pass tag message to git-tag in release-publish

diff --git a/Makefile.am b/Makefile.am
index 5e15e6a..e1ab41e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -135,7 +135,7 @@ release-upload: release-check $(tar_file
 	scp $(tar_file) $(sha1_file) $(gpg_file) $(RELEASE_UPLOAD_HOST):$(RELEASE_UPLOAD_DIR)
 	mv $(tar_file) $(sha1_file) $(gpg_file) releases
 	ssh $(RELEASE_UPLOAD_HOST) "rm -f $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(tar_file) $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
-	git tag -s $(CAIRO_VERSION_MAJOR).$(CAIRO_VERSION_MINOR).$(CAIRO_VERSION_MICRO)
+	git tag -s $(CAIRO_VERSION_MAJOR).$(CAIRO_VERSION_MINOR).$(CAIRO_VERSION_MICRO) -m "cairo $(CAIRO_VERSION_MAJOR).$(CAIRO_VERSION_MINOR).$(CAIRO_VERSION_MICRO) release"
 
 release-publish-message: releases/$(sha1_file)
 	@echo "Pleas push the new tag with a command such as:"
diff-tree 953332d128120e7c4f4197390984be11a80a368b (from 5cb556b5e9f29195cc5df62b3f65c6b6c1e4305c)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Nov 2 21:13:49 2006 -0500

    [Makefile.am] Minor fixes in release-publish output

diff --git a/Makefile.am b/Makefile.am
index cf8e95e..5e15e6a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -160,6 +160,7 @@ release-publish-message: releases/$(sha1
 	@echo ""
 	@echo "	$(RELEASE_URL_BASE)/$(gpg_file)"
 	@echo "	(signed by `getent passwd "$$USER" | cut -d: -f 5 | cut -d, -f 1`)"
+	@echo ""
 	@echo "  Additionally, a git clone of the source tree:"
 	@echo ""
 	@echo "	git clone git://git.cairographics.org/git/cairo"
@@ -175,12 +176,12 @@ release-publish-message: releases/$(sha1
 	@echo ""
 	@echo "============================== CUT HERE =============================="
 	@echo "Also, please add the new entries from the NEWS file as well as the detailed"
-	@echo "change log sent to the cairo-announce list when the tag is pushed."
+	@echo "change log sent to the cairo-commit list when the tag is pushed."
 	@echo ""
 	@echo "The same NEWS entries should be posted on the cairographics.org wiki as well."
 	@echo ""
 	@echo "Last but not least, do not forget to bump up the micro"
-	@echo "version component to the next (odd) number and commit."
+	@echo "version component to the next (odd) number, commit, and push."
 
 release-publish: release-upload release-publish-message