[cairo-commit] pycairo RELEASING, 1.22, 1.23 configure.ac, 1.73, 1.74 Makefile.am, 1.20, 1.21 README, 1.34, 1.35 setup.py, 1.26, 1.27

[Steve Chaplin]

Committed by: stevech1097

Update of /cvs/cairo/pycairo
In directory kemper:/tmp/cvs-serv15780

Modified Files:
	RELEASING configure.ac Makefile.am README setup.py 
Log Message:
'SC'

Index: RELEASING
===================================================================
RCS file: /cvs/cairo/pycairo/RELEASING,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- RELEASING	14 Mar 2007 09:18:16 -0000	1.22
+++ RELEASING	10 Dec 2008 06:50:04 -0000	1.23
@@ -73,3 +73,22 @@
    "make release-publish".
 
 10) Update http://cheeseshop.python.org entry for pycairo.
+
+
+Generating documentation archives
+---------------------------------
+$ cd doc/
+$ vi conf.py  # update the version and release numbers
+$ make clean
+$ make html
+$ cd doc/.build/
+$ mv html pycairo-x.x.x-docs-html
+$ tar cjf /tmp/pycairo-x.x.x-docs-html.tar.bz2 pycairo-x.x.x-docs-html
+$ zip -r  /tmp/pycairo-x.x.x-docs-html.zip     pycairo-x.x.x-docs-html
+$ chmod a+r /tmp/pycairo*
+
+untar docs in /tmp and check that they have correct version number and view
+OK.
+copy file to the 'releases' directory on cairo website.
+
+scp pycairo-xxx cairographics.org:/srv/cairo.freedesktop.org/www/releases

Index: configure.ac
===================================================================
RCS file: /cvs/cairo/pycairo/configure.ac,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- configure.ac	9 Aug 2008 03:32:19 -0000	1.73
+++ configure.ac	10 Dec 2008 06:50:05 -0000	1.74
@@ -8,7 +8,7 @@
 m4_define(pycairo_version, pycairo_version_major.pycairo_version_minor.pycairo_version_micro)
 
 # versions of packages we require
-m4_define(cairo_required_version, 1.6.4)
+m4_define(cairo_required_version, 1.8.0)
 
 AC_INIT([pycairo],
 	[pycairo_version],
@@ -23,7 +23,7 @@
 AC_CONFIG_SRCDIR([cairo/pycairo.h])
 AC_CONFIG_HEADERS(config.h)
 
-AM_INIT_AUTOMAKE([1.9 -Wall])
+AM_INIT_AUTOMAKE([1.9.6 -Wall])
 
 # Options ---
 
@@ -97,6 +97,7 @@
 Makefile
 pycairo.pc
 cairo/Makefile
+doc/Makefile
 examples/Makefile
 test/Makefile
 ])

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/pycairo/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Makefile.am	13 Dec 2007 06:09:52 -0000	1.20
+++ Makefile.am	10 Dec 2008 06:50:05 -0000	1.21
@@ -1,8 +1,6 @@
-SUBDIRS = cairo examples test
+SUBDIRS = cairo examples test doc
 
 EXTRA_DIST = \
-  doc/FAQ \
-  doc/NOTES \
   COPYING \
   COPYING-LGPL-2.1 \
   COPYING-MPL-1.1 \

Index: README
===================================================================
RCS file: /cvs/cairo/pycairo/README,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- README	12 May 2008 12:06:37 -0000	1.34
+++ README	10 Dec 2008 06:50:05 -0000	1.35
@@ -3,7 +3,7 @@
 
 Dependencies
 ------------
-    cairo   >= 1.6.4
+    cairo   >= 1.8.0
     Python  >= 2.5
 
 Compiling
@@ -12,11 +12,8 @@
 
 Documentation
 -------------
-Currently there is no Python specific cairo API documentation. However there
-is the cairo C documentation which can be useful. There is also a NOTES file
-in the tarball release which lists how Pycairo differs from the cairo C API,
-and there are Pycairo examples in the examples/ directory of the tarball
-release.
+The 'doc' directory contains reStructuredText files which are used by Sphinx
+to generate html (and other format) documentation.
 
 License
 -------
@@ -35,3 +32,10 @@
 If you find a bug in Pycairo, please go to
     https://bugs.freedesktop.org/enter_bug.cgi?product=pycairo
 and submit a bugreport.
+
+IMPORTANT: make sure you state which version of cairo and pycairo you are
+using when you report a problem or bug.
+
+>>> import cairo
+>>> cairo.cairo_version_string()  # shows the cairo version
+>>> cairo.version                 # shows the pycairo version

Index: setup.py
===================================================================
RCS file: /cvs/cairo/pycairo/setup.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- setup.py	9 Aug 2008 03:32:19 -0000	1.26
+++ setup.py	10 Dec 2008 06:50:05 -0000	1.27
@@ -7,7 +7,7 @@
 import sys
 
 pycairo_version        = '1.6.5'
-cairo_version_required = '1.6.4'
+cairo_version_required = '1.8.0'
 
 # Notes:
 # on Fedora Core 5 module is compiled with 'gcc -g' - why -g?