[cairo-commit] Branch '1.0' - 3 commits - configure.in Makefile.am NEWS

[Behdad Esfahbod]

 Makefile.am  |    4 +++-
 NEWS         |   11 +++++++++++
 configure.in |    4 ++--
 3 files changed, 16 insertions(+), 3 deletions(-)

New commits:
diff-tree 98facc6c2d0f57f05de7b98c2aaa592c895d1a09 (from 75b0ab0d66c4065c6cd6cd9b1ccddffd7c581dee)
Author: Behdad Esfahbod <behdad at home.(none)>
Date:   Wed Mar 15 14:19:08 2006 -0500

    Add a release-publish-message target to only get the message.

diff --git a/Makefile.am b/Makefile.am
index 3991883..daae59a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -137,7 +137,7 @@ release-upload: release-check $(tar_file
 	ssh $(RELEASE_UPLOAD_HOST) "rm -f $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(tar_file) $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
 	git tag -s $(CAIRO_VERSION_MAJOR).$(CAIRO_VERSION_MINOR).$(CAIRO_VERSION_MICRO)
 
-release-publish: release-upload releases/$(sha1_file)
+release-publish-message: releases/$(sha1_file)
 	@echo ""
 	@echo "Please send an announcement to $(RELEASE_ANNOUNCE_LIST)"
 	@echo "including the following:"
@@ -164,6 +164,8 @@ release-publish: release-upload releases
 	@echo "Last but not least, do not forget to bump up the micro"
 	@echo "version component to the next (odd) number and commit."
 
+release-publish: release-upload release-publish-message
+
 # XXX: Depending on all here is rather overkill. We don't really need
 # the library built in order to create the documentation.
 docs-publish: all
diff-tree 75b0ab0d66c4065c6cd6cd9b1ccddffd7c581dee (from 8c188e45eed41a2a2ee38cdbce834ba139190eda)
Author: Behdad Esfahbod <behdad at home.(none)>
Date:   Wed Mar 15 14:18:40 2006 -0500

    Increment version to 1.0.5 after release.

diff --git a/configure.in b/configure.in
index 08324c6..aac8c4a 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, 0)
-m4_define(cairo_version_micro, 4)
+m4_define(cairo_version_micro, 5)
 
 AC_INIT([cairo],
       cairo_version_major.cairo_version_minor.cairo_version_micro,
diff-tree 8c188e45eed41a2a2ee38cdbce834ba139190eda (from d3ff5228a205ffb29e85907830d5fc72e2ef5358)
Author: Behdad Esfahbod <behdad at home.(none)>
Date:   Wed Mar 15 14:04:00 2006 -0500

    Cairo-1.0.4 released.
    Increment CAIRO_VERSION to 1.0.4 and libtool versioning to 4:4:2.
    Add notes for the 1.0.4 release.

diff --git a/NEWS b/NEWS
index 5f552a7..db43c72 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+Release 1.0.4 (2006-03-15 Behdad Esfahbod <behdad at behdad.org>)
+==============================================================
+This is a bug fix release.  Many fixes in this release are
+backported from the head branch and do not have bug numbers.
+For the bugs in bugzilla that are fixed in this release, see:
+
+	https://bugs.freedesktop.org/buglist.cgi?bug_id=4674,4823,5528,5734,6176,6196,6197
+
+This includes the bug causing Pango crashes with some corrupt
+fonts.  For a list of all changes, see ChangeLog.
+
 Release 1.0.2 (2005-10-03 Carl Worth <cworth at cworth.org>)
 =========================================================
 For each bug number XXXX below, see:
diff --git a/configure.in b/configure.in
index e9ebe30..08324c6 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, 0)
-m4_define(cairo_version_micro, 3)
+m4_define(cairo_version_micro, 4)
 
 AC_INIT([cairo],
       cairo_version_major.cairo_version_minor.cairo_version_micro,
@@ -23,7 +23,7 @@ LT_CURRENT=4
 
 # Increment any time the source changes; set to
 # 0 if you increment CURRENT
-LT_REVISION=3
+LT_REVISION=4
 
 # Increment if any interfaces have been added; set to 0
 # if any interfaces have been removed. removal has