[cairo-commit] cairo ChangeLog, 1.321, 1.322 RELEASING, 1.8, 1.9 configure.in, 1.74, 1.75

[Carl Worth]

Committed by: cworth

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

Modified Files:
	ChangeLog RELEASING configure.in 
Log Message:

        * RELEASING: Add instructions for handling the new -head suffix
        of CAIRO_VERSION at release-time.

        * configure.in: Append -head to CAIRO_VERSION to indicate state
        between snapshots.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -d -r1.321 -r1.322
--- ChangeLog	21 Jan 2005 23:43:55 -0000	1.321
+++ ChangeLog	23 Jan 2005 20:49:56 -0000	1.322
@@ -1,3 +1,15 @@
+2005-01-23  Carl Worth  <cworth at cworth.org>
+
+	* RELEASING: Add instructions for handling the new "-head" suffix
+	of CAIRO_VERSION at release-time.
+
+	* configure.in: Append "-head" to CAIRO_VERSION to indicate state
+	between snapshots.
+
+	* src/cairo_gstate.c: Add missing prototype for	_cairo_gstate_ensure_font.
+	(_cairo_gstate_current_font): Add missing declaration so things
+	compile again.
+
 2005-01-21  Owen Taylor  <otaylor at redhat.com>
 
 	* Call _cairo_gstate_ensure_font(). Don't reference

Index: RELEASING
===================================================================
RCS file: /cvs/cairo/cairo/RELEASING,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- RELEASING	21 Jan 2005 19:20:55 -0000	1.8
+++ RELEASING	23 Jan 2005 20:49:56 -0000	1.9
@@ -39,15 +39,19 @@
 
 4) Increment CAIRO_VERSION in configure.in
 
-	Right now, in its pre-release form, we are incrementing
-	CAIRO_VERSION for each snapshot but we are not changing
-	the libtool shared library version information. Increment the
-	subminor version for bug fixes and backwards-compatible
-	additions to the API. Increment the minor number (and reset
-	the subminor) for backward-incompatible changes to the API
-	(including removals). Leave the major number at 0 until we are
-	ready for the first 1.0 release, (at which point these rules
-	will change).
+	First, remove the "-head" suffix, then increment the version
+	as follows:
+
+	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.
+
+	Otherwise, (that is, if there are only bug fixes and perhaps
+	API additions), then increment only the sub-minor number.
+
+	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).
 
 5) Commit the changes to NEWS and configure.in
 
@@ -71,6 +75,8 @@
 
 	cvs tag SNAPSHOT_X_Y_Z
 
+8) Add a "-head" to CAIRO_VERSION in configure, and commit.
+
 9) Send a message to cairo-announce at cairographics.org to announce the
    new snapshot using the text provided from "make release-publish".
 

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- configure.in	21 Jan 2005 20:48:11 -0000	1.74
+++ configure.in	23 Jan 2005 20:49:56 -0000	1.75
@@ -3,7 +3,7 @@
 dnl ===========================================================================
 
 # Package version number, (as distinct from shared library version)
-CAIRO_VERSION=0.3.0
+CAIRO_VERSION=0.3.0-head
 
 # libtool shared library version