[cairo-commit] cairo ChangeLog, 1.876, 1.877 Makefile.am, 1.15, 1.16 RELEASING, 1.14, 1.15

[Behdad Esfahbod]

Committed by: behdad

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

Modified Files:
	ChangeLog Makefile.am RELEASING 
Log Message:
2005-08-13  Behdad Esfahbod  <behdad at behdad.org>

        * Makefile.am (release-publish): Check that the micro component
        of the version number is even.

        * RELEASING: Fixed the pattern to find all public header files.



Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.876
retrieving revision 1.877
diff -u -d -r1.876 -r1.877
--- ChangeLog	11 Aug 2005 23:52:43 -0000	1.876
+++ ChangeLog	13 Aug 2005 04:35:31 -0000	1.877
@@ -1,3 +1,10 @@
+2005-08-13  Behdad Esfahbod  <behdad at behdad.org>
+
+	* Makefile.am (release-publish): Check that the micro component
+	of the version number is even.
+
+	* RELEASING: Fixed the pattern to find all public header files.
+
 2005-08-11  Carl Worth  <cworth at cworth.org>
 
 	* src/cairo-font.c (_cairo_toy_font_face_fini): Fix inverted sense
@@ -168,7 +175,7 @@
 
 	* configure.in: Change CAIRO_VERSION from 0.9.0-head to 0.9.1.
 
-	Patch from Behdad Esfahbod <behdad at cs.toronto.edu>:
+	Patch from Behdad Esfahbod <behdad at behdad.org>:
 
 	* configure.in: Update to use AC_INIT and AM_INIT_AUTOMAKE in
 	recommended ways. Add support for substituting

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile.am	10 Aug 2005 19:36:51 -0000	1.15
+++ Makefile.am	13 Aug 2005 04:35:31 -0000	1.16
@@ -41,15 +41,24 @@
 
 release-check: release-remove-old distcheck $(md5_file)
 
+release-verify-even-micro:
+	@echo -n "Checking that $(VERSION) has an even micro component..."
+	@test "$(CAIRO_VERSION_MICRO)" = "`echo $(CAIRO_VERSION_MICRO)/2*2 | bc`" \
+		|| (echo "Ouch." && echo "'$(CAIRO_VERSION_MICRO)' is not an even number." \
+		&& echo "The version in configure.in must be incremented before a new release." \
+		&& false)
+	@echo "Good."
+
 release-verify-newer:
 	@echo -n "Checking that no $(VERSION) release already exists..."
 	@ssh $(RELEASE_UPLOAD_HOST) test ! -e $(RELEASE_UPLOAD_DIR)/$(tar_file) \
 		|| (echo "Ouch." && echo "Found: $(RELEASE_UPLOAD_HOST):$(RELEASE_UPLOAD_DIR)/$(tar_file)" \
-		&& echo "The version in configure.in must be incremented before a new release." \
+		&& echo "Are you sure you have an updated CVS checkout?" \
+		&& echo "This should never happen." \
 		&& false)
 	@echo "Good."
 
-release-publish: release-verify-newer release-check
+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
@@ -68,3 +77,6 @@
 	@cat releases/$(md5_file)
 	@echo ""
 	@echo "Also, please include the new entries from the NEWS file."
+	@echo ""
+	@echo "Last but not least, do not forget to bump up the micro"
+	@echo "version component to the next (odd) number and commit."

Index: RELEASING
===================================================================
RCS file: /cvs/cairo/cairo/RELEASING,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- RELEASING	10 Aug 2005 18:30:45 -0000	1.14
+++ RELEASING	13 Aug 2005 04:35:31 -0000	1.15
@@ -36,10 +36,8 @@
 	output of the following command should be examined using the
 	previous release tag:
 
-		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.]
+		find src/ -name '*.h' -not -name '*-private.h' -not -name 'cairoint.h' | \
+		xargs cvs diff -r RELEASE_X_Y_Z
 
 4) Increment cairo_version_{minor|micro} in configure.in: