pixman: Branch 'master' - 4 commits

Wed Jun 25 06:54:19 PDT 2008

Makefile.am  |   13 +++++++----
 RELEASING    |   67 ++++++++++++++++++++++++++++++++++-------------------------
 configure.ac |   21 +++++++-----------
 3 files changed, 56 insertions(+), 45 deletions(-)

New commits:
commit ab4d45806aacf6208820af07b42852c9e4c89fff
Author: SÃ¸ren Sandmann Pedersen <sandmann at daimi.au.dk>
Date:   Wed Jun 25 09:46:12 2008 -0400

    Update versioning documentation

diff --git a/configure.ac b/configure.ac
index f42b676..7977b6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,22 +24,18 @@ AC_PREREQ([2.57])
 
 #   Pixman versioning scheme
 #
-#   - The git version must at all times have an odd MICRO version
-#     number.
+#   - The version in git has an odd MICRO version number
 #
-#   - If you add API, increment the MICRO version to the next largest
-#     odd number.
+#   - Released versions both development and stable have an even MICRO 
+#     version number
 #
-#   - If you release a version that contains new API, then increment
-#     MINOR and set MICRO to 0. 
+#   - Released development versions have an odd MINOR number
 #
-#   - If you release a new version that does not contain new API, then
-#     increment MICRO to the next even number.
+#   - Released stable versions have an event MINOR number
 #
-#   - After doing a release, increment MICRO again to make the version 
-#     number in git odd.
+#   - Versions that break ABI must have a new MAJOR number
 #
-#   - If you break the ABI, then
+#   - If you break the ABI, then at least this must be done:
 #
 #        - increment MAJOR
 #
@@ -54,6 +50,7 @@ AC_PREREQ([2.57])
 #      This ensures that binary incompatible versions can be installed
 #      in parallel.  See http://www106.pair.com/rhp/parallel.html for
 #      more information
+#
 
 m4_define([pixman_major], 0)
 m4_define([pixman_minor], 11)
commit a3c12f4ccfda470574bfe8b7796c0b90237dabe0
Author: SÃ¸ren Sandmann Pedersen <sandmann at daimi.au.dk>
Date:   Wed Jun 25 09:36:13 2008 -0400

    Update release instructions

diff --git a/RELEASING b/RELEASING
index 34d549b..5e7cec1 100644
--- a/RELEASING
+++ b/RELEASING
@@ -4,46 +4,57 @@ Here are the steps to follow to create a new pixman release:
    and that you are up to date with the latest commits in the central
    repository. Here are a couple of useful commands:
 
-	# This should report "nothing to commit (working directory clean")
-	git status
+	git diff			(no output)
+	
+	git status			(should report "nothing to commit")
 
-	# This should give no output, (note there are *3* dots)
-	git log master...origin
+	git log master...origin		(no output; note: *3* dots)
 
-2) Verify that the code passes "make distcheck".
+2) Increment pixman_(major|minor|micro) in configure.ac according to
+   the directions in that file.
 
-	NOTE: There is some test code in the test directory, but it's
-	not yet integrated into "make distcheck" yet. It might be
-	useful to run those programs, (but I don't know how to
-	interpret those results). Another very useful thing to do is
-	to run the cairo test suite against pixman. This can be done
-	by running the following commands with the latest cairo
-	release:
+3) Run 
 
-		tar xzf cairo-X.Y.Z.tar.gz
-		cd cairo
-		CAIRO_TEST_TARGET=image make test
+	make PREV=<last version> release-check
 
-4) Increment pixman_{major|minor|micro} in configure.ac according to
-   the directions in that file. Also note that if there is an ABI
-   change then there is further work to be done, (also described in
-   configure.in).
+   and fix things until it passes.
 
-5) Use "git commit" record any changes made in steps 3 and 4.
+   A very useful thing to do is to run the cairo test suite
+   against pixman. This can be done by running the following
+   commands in the "test" directory of the latest cairo release:
 
-6) Generate the final tar files with
+	tar xzf cairo-X.Y.Z.tar.gz
+	cd cairo
+	CAIRO_TEST_TARGET=image make test
+
+4) Use "git commit" to record any changes made in steps 2 and 3.
+
+5) Generate the final tar files with
 
 	make distcheck
 
-   And publish the tar files to everywhere appropriate.
+   and publish the tar files by running 
 
-   Note: There's a "make release-publish" target to help with this
-   step, (creating the tar file and publishing it), but it depends on
-   getting gpg setup first. It's probably the right way to go in the
-   future, though.
+	make GPGKEY=<your gpg key id> release-publish
 
 7) Increment pixman_micro to the next larger (odd) number in
    configure.ac. Commit this change, and push all commits created
-   during this process.
+   during this process using
+
+	git push --tags
+
+   You must use "--tags" here; otherwise the new tag will not
+   be pushed out. This is because technobable.
+
+8) Run 
+
+	make release-publish-message
+
+   to generate a draft release announcement. Edit it as appropriate and
+   send it to 
+
+	cairo-announce at cairographics.org
+
+   and 
 
-8) Send email announcements of the release to everywhere appropriate.
+	xorg-announce at lists.freedesktop.org
commit ca6edbee41e2e4bd18e3615a86bae441822b90e3
Author: SÃ¸ren Sandmann Pedersen <sandmann at daimi.au.dk>
Date:   Wed Jun 25 09:24:00 2008 -0400

    Explicitly use my GPG key for signing.

diff --git a/Makefile.am b/Makefile.am
index 39ea04d..77c9d61 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,6 +10,7 @@ snapshot:
 	test -d "$(srcdir)/.git" && distdir=$$distdir-`cd "$(srcdir)" && git-rev-parse HEAD | cut -c 1-6`; \
 	$(MAKE) $(AM_MAKEFLAGS) distdir="$$distdir" dist
 
+GPGKEY=6FF7C1A8
 USERNAME=$$USER
 RELEASE_OR_SNAPSHOT = $$(if test "x$(CAIRO_VERSION_MINOR)" = "x$$(echo "$(CAIRO_VERSION_MINOR)/2*2" | bc)" ; then echo release; else echo snapshot; fi)
 RELEASE_CAIRO_HOST =	$(USERNAME)@cairographics.org
@@ -66,22 +67,24 @@ ensure-prev:
 	@if [[ "$(PREV)" == "" ]]; then							\
 		echo ""							          &&	\
 		echo "You must set the PREV variable on the make command line to" &&	\
-		echo "the git tag of the last release."				  &&	\
+		echo "the last version."				  &&	\
 		echo ""								  &&	\
 		echo "For example:"						  &&	\
-		echo "      make PREV=pixman-0.7.3"				  &&	\
+		echo "      make PREV=0.7.3"				  &&	\
 		echo ""								  &&	\
 		false;									\
 	fi
 
 release-check: ensure-prev release-verify-newer release-remove-old distcheck
 
+release-tag:
+	git-tag -u $(GPGKEY) -m "$(PACKAGE) $(VERSION) release" $(PACKAGE)-$(VERSION)
+
 release-upload: release-check $(tar_gz) $(tar_bz2) $(sha1_tgz) $(gpg_file)
 	mkdir -p releases
 	scp $(tar_gz) $(sha1_tgz) $(gpg_file) $(RELEASE_CAIRO_HOST):$(RELEASE_CAIRO_DIR)
 	scp $(tar_gz) $(tar_bz2) $(RELEASE_XORG_HOST):$(RELEASE_XORG_DIR)
 	ssh $(RELEASE_CAIRO_HOST) "rm -f $(RELEASE_CAIRO_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(tar_gz) $(RELEASE_CAIRO_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
-	git-tag -s -m "$(PACKAGE) $(VERSION) release" $(PACKAGE)-$(VERSION)
 
 release-publish-message: $(sha1_tgz) $(md5_tgz) $(sha1_tbz2) $(md5_tbz2) ensure-prev
 	@echo "Please follow the instructions in RELEASING to push stuff out and"
@@ -122,6 +125,6 @@ release-publish-message: $(sha1_tgz) $(md5_tgz) $(sha1_tbz2) $(md5_tbz2) ensure-
 	@echo "============================== CUT HERE =============================="
 	@echo ""
 
-release-publish: release-upload release-publish-message
+release-publish: release-upload release-tag release-publish-message
 
-.PHONY: release-upload release-publish release-publish-message
+.PHONY: release-upload release-publish release-publish-message release-tag
commit c48e3bc5ccf3a2f0aa4cadbaa4a0ae968a5d5a91
Author: SÃ¸ren Sandmann Pedersen <sandmann at daimi.au.dk>
Date:   Wed Jun 25 09:16:09 2008 -0400

    Post-release version bump

diff --git a/configure.ac b/configure.ac
index 0997d64..f42b676 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,7 @@ AC_PREREQ([2.57])
 
 m4_define([pixman_major], 0)
 m4_define([pixman_minor], 11)
-m4_define([pixman_micro], 6)
+m4_define([pixman_micro], 7)
 
 m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
 
