[cairo-commit] cairo ChangeLog, 1.877, 1.878 Makefile.am, 1.16, 1.17 RELEASING, 1.15, 1.16

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo
In directory gabe:/tmp/cvs-serv23893

Modified Files:
	ChangeLog Makefile.am RELEASING 
Log Message:

2005-08-12  Carl Worth  <cworth at cworth.org>

        * RELEASING:
        * Makefile.am: Move tag from an instruction in RELEASING to an
        automated step at the end of release-publish.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.877
retrieving revision 1.878
diff -u -d -r1.877 -r1.878
--- ChangeLog	13 Aug 2005 04:35:31 -0000	1.877
+++ ChangeLog	13 Aug 2005 06:50:17 -0000	1.878
@@ -1,3 +1,9 @@
+2005-08-12  Carl Worth  <cworth at cworth.org>
+
+	* RELEASING:
+	* Makefile.am: Move tag from an instruction in RELEASING to an
+	automated step at the end of release-publish.
+
 2005-08-13  Behdad Esfahbod  <behdad at behdad.org>
 
 	* Makefile.am (release-publish): Check that the micro component

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile.am	13 Aug 2005 04:35:31 -0000	1.16
+++ Makefile.am	13 Aug 2005 06:50:17 -0000	1.17
@@ -58,11 +58,13 @@
 		&& false)
 	@echo "Good."
 
+CVS=cvs
 release-publish: release-verify-even-micro release-verify-newer release-check
 	mkdir -p releases
 	scp $(tar_file) $(md5_file) $(RELEASE_UPLOAD_HOST):$(RELEASE_UPLOAD_DIR)
 	mv $(tar_file) $(md5_file) releases
 	ssh $(RELEASE_UPLOAD_HOST) "rm -f $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-[0-9]* && touch $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
+	$(CVS) tag RELEASE_$(CAIRO_VERSION_MAJOR)_$(CAIRO_VERSION_MINOR)_$(CAIRO_VERSION_MICRO)
 	@echo ""
 	@echo "Please send an announcement to $(RELEASE_ANNOUNCE_LIST)"
 	@echo "including the following:"

Index: RELEASING
===================================================================
RCS file: /cvs/cairo/cairo/RELEASING,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- RELEASING	13 Aug 2005 04:35:31 -0000	1.15
+++ RELEASING	13 Aug 2005 06:50:17 -0000	1.16
@@ -74,15 +74,12 @@
 	* Create a LATEST-package-version file (after deleting any old one)
 	* Place local copies of both files in the releases directory
 	* Provide some text for the release announcement (see below).
+	* Tag the entire source tree with a tag of the form RELEASE_X_Y_Z
 
-7) Tag the entire source tree with a tag of the form RELEASE_X_Y_Z:
-
-	cvs tag RELEASE_X_Y_Z
-
-8) Increment cairo_version_micro to the next larger (odd) number in
+7) Increment cairo_version_micro to the next larger (odd) number in
    configure, and commit.
 
-9) Send a message to cairo-announce at cairographics.org and CC
+8) Send a message to cairo-announce at cairographics.org and CC
    gnome-announce-list at gnome.org to announce the
    new release using the text provided from "make release-publish".