Update release infra to reflect git transition.

4 files changed, 13 insertions, 16 deletions

diff --git a/INSTALL b/INSTALL
index 854113ea4..3d0e2d7d5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -16,7 +16,7 @@ This final step may require temporary root access (eg. with sudo) if
 you don't have write permission to the directory in which cairo will
 be installed.
 
-NOTE: If you are working with source from CVS rather than from a tar
+NOTE: If you are working with source from git/cvs rather than from a tar
 file, then you should use ./autogen.sh in place of ./configure
 anywhere it is mentioned in these instructions.
 
diff --git a/Makefile.am b/Makefile.am
index 0caacb771..3991883ec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -113,7 +113,7 @@ 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 "Are you sure you have an updated CVS checkout?" \
+		&& echo "Are you sure you have an updated checkout?" \
 		&& echo "This should never happen." \
 		&& false)
 	@echo "Good."
@@ -135,7 +135,7 @@ release-upload: release-check $(tar_file) $(sha1_file) $(gpg_file)
 	scp $(tar_file) $(sha1_file) $(gpg_file) $(RELEASE_UPLOAD_HOST):$(RELEASE_UPLOAD_DIR)
 	mv $(tar_file) $(sha1_file) $(gpg_file) releases
 	ssh $(RELEASE_UPLOAD_HOST) "rm -f $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(tar_file) $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
-	$(CVS) tag RELEASE_$(CAIRO_VERSION_MAJOR)_$(CAIRO_VERSION_MINOR)_$(CAIRO_VERSION_MICRO)
+	git tag -s $(CAIRO_VERSION_MAJOR).$(CAIRO_VERSION_MINOR).$(CAIRO_VERSION_MICRO)
 
 release-publish: release-upload releases/$(sha1_file)
 	@echo ""
diff --git a/RELEASING b/RELEASING
index df87e3847..bf7317b53 100644
--- a/RELEASING
+++ b/RELEASING
@@ -1,12 +1,7 @@
 Here are the steps to follow to create a new cairo release:
 
-1) Ensure that there are no local, uncommitted modifications. The best
-   thing to do here may be to begin with a fresh checkout from CVS:
-
-	cvs -d cairographics.org:/cvs/cairo co cairo
-
-   But it's probably good enough if "cvs -q update -Ad" generates no
-   output.
+1) Ensure that there are no local, uncommitted modifications.
+   It's probably good enough if "git status" says so.
 
 2) Verify that the code passes "make distcheck"
 
@@ -32,7 +27,10 @@ Here are the steps to follow to create a new cairo release:
 	previous release tag:
 
 		find src/ -name '*.h' -not -name '*-private.h' -not -name 'cairoint.h' | \
-		xargs cvs diff -r RELEASE_X_Y_Z
+		xargs git diff X.Y.Z --
+	
+	Note that for older releases made under CVS, the tag name is
+	RELEASE_X_Y_Z instead.
 
 4) Increment cairo_version_{minor|micro} and LT_{CURRENT|VERSION|AGE}
    in configure.in:
@@ -55,9 +53,8 @@ Here are the steps to follow to create a new cairo release:
 
 5) Commit the changes to NEWS and configure.in
 
-	Don't forget to fill out the ChangeLog just like with any
-	other commit. It's especially important to mention the new
-	version number in the ChangeLog.
+	It's especially important to mention the new version number in your
+	commit log.
 
 6) Run "make release-publish" which will perform the following steps
    for you:
@@ -71,7 +68,7 @@ Here are the steps to follow to create a new cairo release:
 	* scp the three files to appear on http://cairographics.org/releases
 	* Place local copies of the three files in the releases directory
 	* Create a LATEST-package-version file (after deleting any old one)
-	* Tag the entire source tree with a tag of the form RELEASE_X_Y_Z
+	* Tag the entire source tree with a tag of the form X.Y.Z
 	* Provide some text for the release announcement (see below).
 
 7) Increment cairo_version_micro to the next larger (odd) number in
diff --git a/configure.in b/configure.in
index 37d45ae92..e9ebe3065 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 AC_PREREQ(2.54)
 
 # cairo package version number, (as distinct from shared library version)
-# An odd micro number indicates in-progress development, (eg. from CVS)
+# An odd micro number indicates in-progress development, (eg. from git/cvs)
 # An even micro number indicates a released version.
 m4_define(cairo_version_major, 1)
 m4_define(cairo_version_minor, 0)