[cairo-commit] cairomm ChangeLog, 1.66, 1.67 Makefile.am, 1.6, 1.7 configure.in, 1.16, 1.17

[Jonathon Jongsma]

Committed by: jjongsma

Update of /cvs/cairo/cairomm
In directory kemper:/tmp/cvs-serv14316

Modified Files:
	ChangeLog Makefile.am configure.in 
Log Message:
2006-07-04  Jonathon Jongsma  <jonathon.jongsma at gmail.com>

	* Makefile.am: add ability to do snapshot releases to the
	cairographics.org/snapshots/ directory in addition to official releases
	* configure.in: bumped the revision to 1.1.10 in preparation for a snapshot
	release of the 1.2 API
	* docs/reference/Makefile.am: fixed some distcheck errors


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairomm/ChangeLog,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- ChangeLog	4 Jul 2006 23:08:25 -0000	1.66
+++ ChangeLog	5 Jul 2006 01:22:46 -0000	1.67
@@ -1,5 +1,13 @@
 2006-07-04  Jonathon Jongsma  <jonathon.jongsma at gmail.com>
 
+	* Makefile.am: add ability to do snapshot releases to the
+	cairographics.org/snapshots/ directory in addition to official releases
+	* configure.in: bumped the revision to 1.1.10 in preparation for a snapshot
+	release of the 1.2 API
+	* docs/reference/Makefile.am: fixed some distcheck errors
+
+2006-07-04  Jonathon Jongsma  <jonathon.jongsma at gmail.com>
+
 	* .cvsignore, cairomm/.cvsignore: ignore some autotools files and *.swp
 	files (from vim)
 

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairomm/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am	7 Apr 2006 01:18:24 -0000	1.6
+++ Makefile.am	5 Jul 2006 01:22:46 -0000	1.7
@@ -18,10 +18,11 @@
 #		make release-check
 # or		make release-publish
 
+RELEASE_OR_SNAPSHOT = `if [ "$(GENERIC_MINOR_VERSION)" = $$(echo "$(GENERIC_MINOR_VERSION)/2*2" | bc) ]; then echo release; else echo snapshot; fi`
 RELEASE_UPLOAD_HOST =   cairographics.org
 RELEASE_UPLOAD_BASE =	/srv/cairo.freedesktop.org/www
-RELEASE_UPLOAD_DIR =	$(RELEASE_UPLOAD_BASE)/releases
-RELEASE_URL_BASE = 	http://cairographics.org/releases
+RELEASE_UPLOAD_DIR =	$(RELEASE_UPLOAD_BASE)/$(RELEASE_OR_SNAPSHOT)s
+RELEASE_URL_BASE = 	http://cairographics.org/$(RELEASE_OR_SNAPSHOT)s
 RELEASE_ANNOUNCE_LIST = cairo-announce at cairographics.org (and CC gnome-announce-list at gnome.org)
 CVS = cvs
 
@@ -40,8 +41,6 @@
 	@echo "Please enter your GPG password to sign the checksum."
 	gpg --armor --sign $^ 
 
-
-
 release-verify-even-micro:
 	@echo -n "Checking that $(VERSION) has an even micro component..."
 	@test "$(GENERIC_MICRO_VERSION)" = "`echo $(GENERIC_MICRO_VERSION)/2*2 | bc`" \
@@ -78,15 +77,15 @@
 	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_$(GENERIC_MAJOR_VERSION)_$(GENERIC_MINOR_VERSION)_$(GENERIC_MICRO_VERSION)
 
-release-publish: release-upload releases/$(sha1_file)
+release-publish: 
 	@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 ""
@@ -100,7 +99,7 @@
 	@echo "	(signed by `getent passwd "$$USER" | cut -d: -f 5 | cut -d, -f 1`)"
 	@echo ""
 	@echo "cairomm is a C++ API for the cairo graphics library.  For more "
-	@echo "information, see http://cairographics.org"
+	@echo "information, see http://cairographics.org/cairomm"
 	@echo ""
 	@echo "============================== CUT HERE =============================="
 	@echo "Also, please include the new entries from the NEWS file."

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairomm/configure.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- configure.in	1 Jul 2006 03:00:41 -0000	1.16
+++ configure.in	5 Jul 2006 01:22:46 -0000	1.17
@@ -1,9 +1,9 @@
 AC_INIT(cairomm/cairomm.h)
 
 #release versioning
-GENERIC_MAJOR_VERSION=0
-GENERIC_MINOR_VERSION=7
-GENERIC_MICRO_VERSION=0
+GENERIC_MAJOR_VERSION=1
+GENERIC_MINOR_VERSION=1
+GENERIC_MICRO_VERSION=10
 GENERIC_VERSION=$GENERIC_MAJOR_VERSION.$GENERIC_MINOR_VERSION.$GENERIC_MICRO_VERSION
 AC_SUBST(GENERIC_MAJOR_VERSION)
 AC_SUBST(GENERIC_MINOR_VERSION)