From 8df9bfecadda5bc98d2fe484f6ea55110ac99b2c Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Wed, 10 Aug 2005 11:30:45 +0000 Subject: [PATCH] Change release instructions to indicate new odd-micro version for in-progress development, and even-micro for released versions. Do a bit of snapshot->release renaming. --- ChangeLog | 9 +++++++++ Makefile.am | 4 ++-- RELEASING | 41 ++++++++++++++++++++++------------------- 3 files changed, 33 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6489ab822..4fc9043ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2005-08-10 Carl Worth + * Makefile.am: + * RELEASING: Change release instructions to indicate new odd-micro + version for in-progress development, and even-micro for released + versions. Do a bit of snapshot->release renaming. + +2005-08-10 Carl Worth + + * configure.in: Change CAIRO_VERSION from 0.9.0-head to 0.9.1. + Patch from Behdad Esfahbod : * configure.in: Update to use AC_INIT and AM_INIT_AUTOMAKE in diff --git a/Makefile.am b/Makefile.am index e375b1b16..d1a6dce79 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,9 +58,9 @@ release-publish: release-verify-newer release-check @echo "Please send an announcement to $(RELEASE_ANNOUNCE_LIST)" @echo "including the following:" @echo "" - @echo "Subject: $(PACKAGE) snapshot $(VERSION) now available" + @echo "Subject: $(PACKAGE) release $(VERSION) now available" @echo "" - @echo "A new $(PACKAGE) snapshot $(VERSION) is now available from:" + @echo "A new $(PACKAGE) release $(VERSION) is now available from:" @echo "" @echo " $(RELEASE_URL_BASE)/$(tar_file)" @echo " $(RELEASE_URL_BASE)/$(md5_file)" diff --git a/RELEASING b/RELEASING index 3d38068f6..abb7e39fb 100644 --- a/RELEASING +++ b/RELEASING @@ -29,33 +29,35 @@ fixes are committed. Here are the steps to follow: 3) Fill out an entry in the NEWS file Sift through the information in ChangeLog since the last - snapshot. Summarize major changes briefly in a style similar + release. Summarize major changes briefly in a style similar to other entries in NEWS. Take special care to note any - incompatible changes in the API. These should be easy to find + additions in the API. These should be easy to find by looking for cairo*.h in the ChangeLog. Additionally, the output of the following command should be examined using the - previous snapshot tag: + previous release tag: - cvs diff -r SNAPSHOT_X_Y_Z src/*.h + cvs diff -r RELEASE_X_Y_Z src/*.h [Hmm, it would be nice to have a pattern for that command that would exclude private header files.] -4) Increment CAIRO_VERSION in configure.in +4) Increment cairo_version_{minor|micro} in configure.in: - First, remove the "-head" suffix, then increment the version - as follows: + If there are backward-incompatible changes in the API, stop + now and don't release. Go back and fix the API instead. Cairo + is intended to remain backwards-compatible as far as API. - If there are backward-incompatible changes in the API, - (function removals, or semantic changes), increment the minor - number and reset the sub-minor number to 0. + So cairo_version_major will not be incremented unless we come + up with a new versioning scheme to take advantage of it. - Otherwise, (that is, if there are only bug fixes and perhaps - API additions), then increment only the sub-minor number. + If there are API additions, then increment + cairo_version_minor and reset cairo_version_micro to 0. - Prior to the initial "1.0" release of cairo, leave the major - number at 0. Also, do not modify the "libtool shared library - version" variables, (LT_CURRENT, LT_VERSION, LT_AGE). + Otherwise, (ie. there are only bug fixes), increment + cairo_version_micro to the next larger (even) number. + + Adjust LT_CURRENT, LT_VERSION, and LT_AGE as describe in the + comments in configure.in. 5) Commit the changes to NEWS and configure.in @@ -75,13 +77,14 @@ fixes are committed. Here are the steps to follow: * Place local copies of both files in the releases directory * Provide some text for the release announcement (see below). -7) Tag the entire source tree with a tag of the form SNAPSHOT_X_Y_Z: +7) Tag the entire source tree with a tag of the form RELEASE_X_Y_Z: - cvs tag SNAPSHOT_X_Y_Z + cvs tag RELEASE_X_Y_Z -8) Add a "-head" to CAIRO_VERSION in configure, and commit. +8) Increment cairo_version_micro to the next larger (odd) number in + configure, and commit. 9) Send a message to cairo-announce@cairographics.org and CC gnome-announce-list@gnome.org to announce the - new snapshot using the text provided from "make release-publish". + new release using the text provided from "make release-publish".