[cairo-commit] pycairo ChangeLog, 1.175, 1.176 configure.ac, 1.35, 1.36 Makefile.am, 1.13, 1.14

Tue Aug 30 12:53:07 EST 2005

Committed by: stevech1097

Update of /cvs/cairo/pycairo
In directory gabe:/tmp/cvs-serv29659

Modified Files:
	ChangeLog configure.ac Makefile.am 
Log Message:
'SC'

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/pycairo/ChangeLog,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -d -r1.175 -r1.176

--- ChangeLog	29 Aug 2005 14:52:30 -0000	1.175
+++ ChangeLog	30 Aug 2005 02:53:05 -0000	1.176
@@ -1,3 +1,23 @@
+=== Pycairo 1.0.0 ===
+2005-08-30  Steve Chaplin  <steve1097 at yahoo.com.au>
+
+	* configure.ac:
+	* Makefile.am : fix errors introduced by previous commit
+
+2005-08-30  Steve Chaplin  <steve1097 at yahoo.com.au>
+
+	* Makefile.am : update to follow (some of) the new cairo release
+	procedures
+
+	* README : increase cairo dependency to 1.0.0
+
+	* setup.py :
+	* configure.ac: increase pycairo version to 1.0.0
+
+	* NEWS: update for 1.0.0 release
+
+	* RELEASING: updated procedure
+
 2005-08-29  Steve Chaplin  <steve1097 at yahoo.com.au>
 
 	* examples/gradient.py :

Index: configure.ac
===================================================================
RCS file: /cvs/cairo/pycairo/configure.ac,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- configure.ac	25 Aug 2005 11:48:09 -0000	1.35
+++ configure.ac	30 Aug 2005 02:53:05 -0000	1.36
@@ -2,10 +2,10 @@
 AC_PREREQ(2.54)
 
 # the pycairo version number
-m4_define(pycairo_major_version, 0)
-m4_define(pycairo_minor_version, 9)
-m4_define(pycairo_micro_version, 0)
-m4_define(pycairo_version, pycairo_major_version.pycairo_minor_version.pycairo_micro_version)
+m4_define(pycairo_version_major, 1)
+m4_define(pycairo_version_minor, 0)
+m4_define(pycairo_version_micro, 0)
+m4_define(pycairo_version, pycairo_version_major.pycairo_version_minor.pycairo_version_micro)
 
 # versions of packages we require
 m4_define(cairo_required_version,    1.0.0)
@@ -13,12 +13,15 @@
 m4_define(pygtk_required_version,    2.2.0)
 m4_define(libsvg_cairo_required_version, 0.1.6)
 
-AC_INIT(pycairo, pycairo_version)
+AC_INIT([pycairo],
+	[pycairo_version],
+	[http://bugs.freedesktop.org/enter_bug.cgi?product=cairo])
 
-AC_DEFINE(PYCAIRO_MAJOR_VERSION, pycairo_major_version,[Pycairo major version])
-AC_DEFINE(PYCAIRO_MINOR_VERSION, pycairo_minor_version,[Pycairo minor version])
-AC_DEFINE(PYCAIRO_MICRO_VERSION, pycairo_micro_version,[Pycairo macro version])
-AC_SUBST(VERSION_INFO, [pycairo_major_version,pycairo_minor_version,pycairo_micro_version])
+AC_SUBST(PYCAIRO_VERSION_MAJOR, [pycairo_version_major])
+AC_SUBST(PYCAIRO_VERSION_MINOR, [pycairo_version_minor])
+AC_SUBST(PYCAIRO_VERSION_MICRO, [pycairo_version_micro])
+AC_SUBST(VERSION_INFO,
+	[pycairo_version_major,pycairo_version_minor,pycairo_version_micro])
 
 AC_CONFIG_SRCDIR([cairo/pycairo.h])
 AC_CONFIG_HEADERS(config.h)
@@ -112,7 +115,7 @@
 
 case $GCC in
 yes)
-  # code using Py_True, Py_False will receive 
+  # code using Py_True, Py_False will receive
   # "warning: dereferencing type-punned pointer will break strict-aliasing rules"
   # -fno-strict-aliasing (as used in Python build) switches warnings off
     AC_MSG_CHECKING(whether $CC accepts -fno-strict-aliasing)

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/pycairo/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile.am	24 Jul 2005 14:21:09 -0000	1.13
+++ Makefile.am	30 Aug 2005 02:53:05 -0000	1.14
@@ -18,9 +18,10 @@
 # or		make release-publish
 
 RELEASE_UPLOAD_HOST =   cairographics.org
-RELEASE_UPLOAD_DIR =    /srv/cairo.freedesktop.org/www/snapshots
-RELEASE_URL_BASE = 	http://cairographics.org/snapshots
-RELEASE_ANNOUNCE_LIST = cairo-announce at 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_ANNOUNCE_LIST = cairo-announce at cairographics.org (and CC python-announce-list at python.org)
 
 tar_file = $(PACKAGE)-$(VERSION).tar.gz
 md5_file = $(tar_file).md5
@@ -28,35 +29,59 @@
 $(md5_file): $(tar_file)
 	md5sum $^ > $@
 
-release-remove-old:
-	rm -f $(tar_file) $(md5_file)
-
-release-check: release-remove-old distcheck $(md5_file)
+release-verify-even-micro:
+	@echo -n "Checking that $(VERSION) has an even micro component..."
+	@test "$(PYCAIRO_VERSION_MICRO)" = "`echo $(PYCAIRO_VERSION_MICRO)/2*2 | bc`" \
+		|| (echo "Ouch." && echo "The version micro component '$(PYCAIRO_VERSION_MICRO)' is not an even number." \
+		&& echo "The version in configure.in must be incremented before a new release." \
+		&& false)
+	@echo "Good."
 
 release-verify-newer:
 	@echo -n "Checking that no $(VERSION) release already exists..."
 	@ssh $(RELEASE_UPLOAD_HOST) test ! -e $(RELEASE_UPLOAD_DIR)/$(tar_file) \
 		|| (echo "Ouch." && echo "Found: $(RELEASE_UPLOAD_HOST):$(RELEASE_UPLOAD_DIR)/$(tar_file)" \
-		&& echo "The version in configure.in must be incremented before a new release." \
+		&& echo "Are you sure you have an updated CVS checkout?" \
+		&& echo "This should never happen." \
 		&& false)
 	@echo "Good."
 
-release-publish: release-verify-newer release-check
+release-remove-old:
+	rm -f $(tar_file) $(md5_file)
+
+release-check: release-verify-even-micro release-verify-newer release-remove-old distcheck $(md5_file)
+
+release-upload: release-check $(tar_file) $(md5_file)
 	mkdir -p releases
 	scp $(tar_file) $(md5_file) $(RELEASE_UPLOAD_HOST):$(RELEASE_UPLOAD_DIR)
 	mv $(tar_file) $(md5_file) releases
-	ssh $(RELEASE_UPLOAD_HOST) "rm -f $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-[0-9]* && touch $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
+	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_$(PYCAIRO_VERSION_MAJOR)_$(PYCAIRO_VERSION_MINOR)_$(CAIRO_VERSION_MICRO)
+
+release-publish: release-upload releases/$(md5_file)
 	@echo ""
 	@echo "Please send an announcement to $(RELEASE_ANNOUNCE_LIST)"
 	@echo "including the following:"
 	@echo ""
-	@echo "Subject: $(PACKAGE) snapshot $(VERSION) now available"
+	@echo "Subject: ANN: $(PACKAGE) release $(VERSION) now available"
 	@echo ""
-	@echo "A new $(PACKAGE) snapshot $(VERSION) is now available from:"
+	@echo "============================== CUT HERE =============================="
+	@echo "Pycairo is a set of Python bindings for the multi-platform 2D graphics library cairo."
+	@echo "http://cairographics.org"
+	@echo "http://cairographics.org/pycairo"
+	@echo ""
+	@echo "A new $(PACKAGE) release $(VERSION) is now available from:"
 	@echo ""
 	@echo "	$(RELEASE_URL_BASE)/$(tar_file)"
 	@echo "	$(RELEASE_URL_BASE)/$(md5_file)"
+	@echo ""
 	@echo -n "	"
 	@cat releases/$(md5_file)
 	@echo ""
+	@echo "============================== CUT HERE =============================="
 	@echo "Also, please include the new entries from the NEWS file."
+	@echo ""
+	@echo "Last but not least, do not forget to bump up the micro"
+	@echo "version component to the next (odd) number and commit."
+
+.PHONY: release-verify-even-micro release-verify-newer release-remove-old release-check release-upload release-publish

