Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/Makefile.am,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile.am
--- Makefile.am	10 Aug 2005 19:36:51 -0000	1.15
+++ Makefile.am	13 Aug 2005 04:09:47 -0000
@@ -41,15 +41,24 @@ release-remove-old:
 
 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 @@ release-publish: release-verify-newer re
 	@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
diff -u -p -r1.14 RELEASING
--- RELEASING	10 Aug 2005 18:30:45 -0000	1.14
+++ RELEASING	13 Aug 2005 04:09:47 -0000
@@ -36,10 +36,8 @@ fixes are committed. Here are the steps 
 	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: