=== Py2cairo 1.10.0 ===

5 files changed, 60 insertions, 24 deletions

diff --git a/NEWS b/NEWS
index daf1ca7..994db8a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,28 @@
+Overview of changes from py2cairo 1.8.10 to py2cairo 1.10.0
+===========================================================
+General Changes:
+    py2cairo 1.10.0 requires cairo 1.10.0 (or later).
+
+New Constants:
+    cairo.FORMAT_RGB16_565
+
+Bug Fixes:
+    context.get_source().get_surface() fails        #33013
+    Add support for './waf configure --libdir=XXX'  #30230
+
+Documentation Changes:
+    Upgrade to using Sphinx 1.0.7.
+    Include html documentation in the pycairo archive file.
+
+Build Changes:
+    Update waf to 1.6.3
+
+Other Changes:
+    Remove setup.py
+    Improve/simplify unicode filename support.
+    Improve/simplify unicode text support.
+
+
 Overview of changes from pycairo 1.8.8 to pycairo 1.8.10
 ========================================================
 General Changes:
diff --git a/RELEASING b/RELEASING
index 17b29a5..36a648a 100644
--- a/RELEASING
+++ b/RELEASING
@@ -1,31 +1,35 @@
-Here are the steps to follow to create a new pycairo release:
+Steps to follow to create a new py2cairo release
+------------------------------------------------
 
-1) Fill out an entry in the NEWS file
+1) Add a new NEWS entry
 Sift through the information in 'git log' since the last release. Summarize
 major changes briefly in a style similar to other entries in NEWS.
 
+
 2) Increment pycairo and cairo version numbers in:
    configure.ac
    doc/conf.py
    README
-   setup.py
    wscript
 
-Increment pycairo_major/minor/micro_version in configure.ac
-Increase the cairo_required_version - to an even numbered version.
-Increment pycairo_major/minor version to match the cairo major/minor version
-that pycairo requires (and increment the micro version if necessary for any
-subsequent pycairo updates).
 
-3) Run "make distcheck" and verify that it gives no warnings or errors and
-   ends with a message of the form:
+3) Create the archive
+$ cd doc
+$ make clean; make html  # view docs and ensure version number is correct
+
+$ cd ..
+$ ./waf distcheck  # ensure there are no errors
+$ rm -rf py2cairo-X.X.X*
+
+$ make clean  # clean from autotools
+$ ./waf clean distclean
+$ ./waf dist       # to create py2cairo-x.x.x.tar.bz2
+                   # create sha1 sum
+$ sha1sum py2cairo-x.x.x.tar.bz2 > py2cairo-x.x.x.tar.bz2.sha1
 
-	===============================================
-	py2cairo-X.Y.Z archives ready for distribution:
-	py2cairo-X.Y.Z.tar.gz
-	===============================================
+$ mv py2cairo-X.X.X* /tmp
+  # install from the archive, run tests and examples.
 
-Install from the tar.gz archive, run tests and examples.
 
 4) Commit the changes to NEWS, configure.ac etc
 It's especially important to mention the new version number in the git commit
diff --git a/configure.ac b/configure.ac
index 4e39759..02158de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,12 +3,12 @@ AC_PREREQ(2.59)
 
 # the pycairo version number
 m4_define(pycairo_version_major, 1)
-m4_define(pycairo_version_minor, 8)
-m4_define(pycairo_version_micro, 11)
+m4_define(pycairo_version_minor, 10)
+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.8.10)
+m4_define(cairo_required_version, 1.10.0)
 m4_define(xpyb_required_version, 1.3)
 
 AC_INIT([py2cairo],
diff --git a/doc/conf.py b/doc/conf.py
index 0e5f15a..aa25b78 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -48,9 +48,9 @@ copyright = u'2008, Steve Chaplin'
 # built documents.
 #
 # The short X.Y version.
-version = '1.8'
+version = '1.10'
 # The full version, including alpha/beta/rc tags.
-release = '1.8.11'
+release = '1.10.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/wscript b/wscript
index 7b46e41..98d4c0d 100644
--- a/wscript
+++ b/wscript
@@ -7,7 +7,7 @@ out = 'build_directory'
 d = top
 
 APPNAME='py2cairo'
-VERSION='1.8.11'
+VERSION='1.10.0'
 cairo_version_required = '1.10.0'
 
 
@@ -69,8 +69,6 @@ def dist(ctx):
   # exclude these files from the distribution archive
   exclude  = (
     'build_directory/',
-    'doc/html_docs_create.sh',
-    'doc/html_docs_upload.sh',
     'doc/_static/',
     'doc/_templates/',
     'doc/_build/doctrees/',
@@ -94,6 +92,15 @@ def dist(ctx):
     'autogen.sh',
     'autom4*',
     'config.log',
-    # ... many more ...
+    'config.guess',
+    'config.sub',
+    'depcomp',
+    'install-sh',
+    'missing',
+    'py-compile',
+    'src/.deps/',
+    'src/.libs/',
+    '**/*.lo',
+    '**/stamp-h1',
     )
   ctx.excl = ' '.join(exclude)