[cairo-commit] 3 commits - configure.in doc/public Makefile.am NEWS RELEASING

Carl Worth cworth at kemper.freedesktop.org
Fri Jun 16 09:50:30 PDT 2006


 Makefile.am                      |   25 ++++++++++++++++++++++---
 NEWS                             |   17 +++++++++++++++++
 RELEASING                        |    2 +-
 configure.in                     |    6 +++---
 doc/public/tmpl/cairo-image.sgml |    1 +
 5 files changed, 44 insertions(+), 7 deletions(-)

New commits:
diff-tree 65e73c81b83222de873935cf384e514ea20ac854 (from b992e1e29d6d63de2a6b5b48b93d23be50fc29ca)
Author: Carl Worth <cworth at cworth.org>
Date:   Fri Jun 16 09:45:44 2006 -0700

    Update version to 1.1.10 and add notes to NEWS file.
    
    Also update libtool version information to 10:0:8.

diff --git a/NEWS b/NEWS
index a52baf5..95e09a4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,20 @@
+Snapshot 1.1.10 (2006-06-16 Carl Worth <cworth at cworth.org>)
+===========================================================
+This is the fifth in a series of snapshots working toward the 1.2
+release of cairo.
+
+The primary motivation for this snapshot is to fix a long-standing bug
+that had long been silent, but as of the 1.1.8 snapshot started
+causing crashes when run against 16-bit depth X servers, (often Xvnc
+or Xnest). The fix for this adds a new CAIRO_FORMAT_RGB16_565 to the
+API.
+
+This snapshot also includes a rewrite of cairo's SVG backend to
+eliminate the dependency on libxml2. With this in place, cairo 1.2
+will not depend on any libraries that cairo 1.0 did not.
+
+As usual, there are also a few fixes for minor bugs.
+
 Snapshot 1.1.8 (2006-06-14 Carl Worth <cworth at cworth.org>)
 ==========================================================
 This is the fourth in a series of snapshots working toward the 1.2
diff --git a/configure.in b/configure.in
index cbe6a7f..5ff352c 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_PREREQ(2.54)
 # An even micro number indicates a released version.
 m4_define(cairo_version_major, 1)
 m4_define(cairo_version_minor, 1)
-m4_define(cairo_version_micro, 9)
+m4_define(cairo_version_micro, 10)
 
 AC_INIT([cairo],
       cairo_version_major.cairo_version_minor.cairo_version_micro,
@@ -19,7 +19,7 @@ dnl ====================================
 # libtool shared library version
 
 # Increment if the interface has additions, changes, removals.
-LT_CURRENT=9
+LT_CURRENT=10
 
 # Increment any time the source changes; set to
 # 0 if you increment CURRENT
@@ -28,7 +28,7 @@ LT_REVISION=0
 # Increment if any interfaces have been added; set to 0
 # if any interfaces have been removed. removal has
 # precedence over adding, so set to 0 if both happened.
-LT_AGE=7
+LT_AGE=8
 
 dnl ===========================================================================
 
diff-tree b992e1e29d6d63de2a6b5b48b93d23be50fc29ca (from 4a5111695c25ce9178f1eb69acd825b3466fcb11)
Author: Carl Worth <cworth at cworth.org>
Date:   Fri Jun 16 09:44:33 2006 -0700

    Annoying doc template churn.

diff --git a/doc/public/tmpl/cairo-image.sgml b/doc/public/tmpl/cairo-image.sgml
index 8e8dc86..345d499 100644
--- a/doc/public/tmpl/cairo-image.sgml
+++ b/doc/public/tmpl/cairo-image.sgml
@@ -29,4 +29,5 @@ Rendering to memory buffers
 @CAIRO_FORMAT_RGB24: 
 @CAIRO_FORMAT_A8: 
 @CAIRO_FORMAT_A1: 
+ at CAIRO_FORMAT_RGB16_565: 
 
diff-tree 4a5111695c25ce9178f1eb69acd825b3466fcb11 (from c6164d0d2a9ca16a00c2768f24a0230de6cbc6f6)
Author: Carl Worth <cworth at cworth.org>
Date:   Fri Jun 16 09:22:36 2006 -0700

    Update release rules in Makefile to add git signature information.

diff --git a/Makefile.am b/Makefile.am
index d920d35..923f4ba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,6 +65,7 @@ RELEASE_UPLOAD_BASE =	/srv/cairo.freedes
 RELEASE_UPLOAD_DIR =	$(RELEASE_UPLOAD_BASE)/snapshots
 RELEASE_URL_BASE = 	http://cairographics.org/snapshots
 RELEASE_ANNOUNCE_LIST = cairo-announce at cairographics.org (and CC gnome-announce-list at gnome.org)
+RELEASE_OR_SNAPSHOT = `if [ "$(CAIRO_VERSION_MINOR)" = $$(echo "$(CAIRO_VERSION_MINOR)/2*2" | bc) ]; then echo release; else echo snapshot; fi`
 
 MANUAL_DATED =		cairo-manual-`date +%Y%m%d`
 MANUAL_TAR_FILE = 	$(MANUAL_DATED).tar.gz
@@ -142,14 +143,17 @@ release-upload: release-check $(tar_file
 	git tag -s $(CAIRO_VERSION_MAJOR).$(CAIRO_VERSION_MINOR).$(CAIRO_VERSION_MICRO)
 
 release-publish-message: releases/$(sha1_file)
+	@echo "Pleas push the new tag with a command such as:"
+	@echo ""
+	@echo "	git push master $(VERSION)"
 	@echo ""
 	@echo "Please send an announcement to $(RELEASE_ANNOUNCE_LIST)"
 	@echo "including the following:"
 	@echo ""
-	@echo "Subject: $(PACKAGE) release $(VERSION) now available"
+	@echo "Subject: $(PACKAGE) $(RELEASE_OR_SNAPSHOT) $(VERSION) now available"
 	@echo ""
 	@echo "============================== CUT HERE =============================="
-	@echo "A new $(PACKAGE) release $(VERSION) is now available from:"
+	@echo "A new $(PACKAGE) $(RELEASE_OR_SNAPSHOT) $(VERSION) is now available from:"
 	@echo ""
 	@echo "	$(RELEASE_URL_BASE)/$(tar_file)"
 	@echo ""
@@ -161,9 +165,24 @@ release-publish-message: releases/$(sha1
 	@echo ""
 	@echo "	$(RELEASE_URL_BASE)/$(gpg_file)"
 	@echo "	(signed by `getent passwd "$$USER" | cut -d: -f 5 | cut -d, -f 1`)"
+	@echo "  Additionally, a git clone of the source tree:"
+	@echo ""
+	@echo "	git clone git://git.cairographics.org/git/cairo"
+	@echo ""
+	@echo "    will include a signed $(VERSION) tag which points to a commit named:"
+	@echo "	`git cat-file tag $(VERSION) | grep ^object | sed -e 's,object ,,'`"
+	@echo ""
+	@echo "    which can be verified with:"
+	@echo "	git verify-tag $(VERSION)"
+	@echo ""
+	@echo "    and can be checked out with a command such as:"
+	@echo "	git checkout -b build $(VERSION)"
 	@echo ""
 	@echo "============================== CUT HERE =============================="
-	@echo "Also, please include the new entries from the NEWS file."
+	@echo "Also, please add the new entries from the NEWS file as well as the detailed"
+	@echo "change log sent to the cairo-announce list when the tag is pushed."
+	@echo ""
+	@echo "The same NEWS entries should be posted on the cairographics.org wiki as well."
 	@echo ""
 	@echo "Last but not least, do not forget to bump up the micro"
 	@echo "version component to the next (odd) number and commit."
diff --git a/RELEASING b/RELEASING
index d1e1998..89433ee 100644
--- a/RELEASING
+++ b/RELEASING
@@ -84,7 +84,7 @@ Here are the steps to follow to create a
 
 7) Push the newly created tag out to the central tree wih a command something like:
 
-	git push cairo refs/tags/X.Y.Z
+	git push cairo X.Y.Z
 
 8) Increment cairo_version_micro to the next larger (odd) number in
    configure, and commit.


More information about the cairo-commit mailing list