[cairo-commit] cairo ChangeLog, 1.1104, 1.1105 Makefile.am, 1.26, 1.27 configure.in, 1.148, 1.149

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo
In directory gabe:/tmp/cvs-serv13450

Modified Files:
	ChangeLog Makefile.am configure.in 
Log Message:

2005-10-13  Carl Worth  <cworth at cworth.org>

        Reviewed by: otaylor

        * configure.in: Increment libtool versioning to 5:0:3 in
        anticipation of 1.2.0 which will add interfaces. The motivation
        for this is to make the 1.1.1 release install a library which will
        be considered newer than 1.0.2.

        * Makefile.am: Add a release-verify-soname-major check to verify
        that the soname major number is always 2 as part of the
        release-publish target.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.1104
retrieving revision 1.1105
diff -u -d -r1.1104 -r1.1105
--- ChangeLog	12 Oct 2005 22:05:09 -0000	1.1104
+++ ChangeLog	13 Oct 2005 14:30:15 -0000	1.1105
@@ -1,3 +1,16 @@
+2005-10-13  Carl Worth  <cworth at cworth.org>
+
+	Reviewed by: otaylor
+
+	* configure.in: Increment libtool versioning to 5:0:3 in
+	anticipation of 1.2.0 which will add interfaces. The motivation
+	for this is to make the 1.1.1 release install a library which will
+	be considered newer than 1.0.2.
+	
+	* Makefile.am: Add a release-verify-soname-major check to verify
+	that the soname major number is always 2 as part of the
+	release-publish target.
+
 2005-10-12  T Rowley  <tim.rowley at gmail.com>
 
 	Reviewed by: cworth

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- Makefile.am	25 Aug 2005 09:59:40 -0000	1.26
+++ Makefile.am	13 Oct 2005 14:30:16 -0000	1.27
@@ -62,6 +62,14 @@
 
 zips: $(runtime_zip_file) $(developer_zip_file)
 
+release-verify-soname-major:
+	@echo -n "Checking that the cairo soname major number is 2..."
+	@test "$(LT_CURRENT_MINUS_AGE)" = "2" \
+		|| (echo "Ouch." && echo "The soname major number is $(LT_CURRENT_MINUS_AGE) instead of 2." \
+		&& echo "The libtool shared library version numbers in configure.in must be incremented properly." \
+		&& false)
+	@echo "Good."
+
 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`" \
@@ -89,7 +97,7 @@
 release-cleanup-group-sticky:
 	find . -type f | xargs chmod g-s
 
-release-check: release-verify-even-micro release-verify-newer release-remove-old release-cleanup-group-sticky distcheck
+release-check: release-verify-soname-major release-verify-even-micro release-verify-newer release-remove-old release-cleanup-group-sticky distcheck
 
 release-upload: release-check $(tar_file) $(sha1_file) $(gpg_file)
 	mkdir -p releases

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- configure.in	8 Oct 2005 18:57:45 -0000	1.148
+++ configure.in	13 Oct 2005 14:30:16 -0000	1.149
@@ -19,16 +19,16 @@
 # libtool shared library version
 
 # Increment if the interface has additions, changes, removals.
-LT_CURRENT=4
+LT_CURRENT=5
 
 # Increment any time the source changes; set to
 # 0 if you increment CURRENT
-LT_REVISION=2
+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=2
+LT_AGE=3
 
 dnl ===========================================================================