summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Chaplin <stevech1097@yahoo.com.au>2009-08-26 22:29:22 +0800
committerSteve Chaplin <stevech1097@yahoo.com.au>2009-08-26 22:29:22 +0800
commit88080d88056c405131a47ea5023437c1310587e2 (patch)
tree606161b4c55ba7395bba803ae05c1c4ec35c942e
parent06f2d1063409fa5b1974ec033c746a549839d237 (diff)
downloadpy2cairo-88080d88056c405131a47ea5023437c1310587e2.tar.gz
Add the missing waf files to the distribution.
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac4
-rwxr-xr-xsetup.py2
-rw-r--r--src/Makefile.am2
-rw-r--r--wscript5
5 files changed, 11 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index b2de1ac..b682d14 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,9 @@ EXTRA_DIST = \
COPYING-LGPL-2.1 \
COPYING-MPL-1.1 \
pycairo.pc.in \
- setup.py
+ setup.py \
+ waf \
+ wscript
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = pycairo.pc
diff --git a/configure.ac b/configure.ac
index dca9651..8e1301a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,11 +4,11 @@ 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, 8)
+m4_define(pycairo_version_micro, 9)
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.6)
+m4_define(cairo_required_version, 1.8.8)
AC_INIT([pycairo],
[pycairo_version],
diff --git a/setup.py b/setup.py
index 1830142..da67e69 100755
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ import io
import subprocess
import sys
-pycairo_version = '1.8.8'
+pycairo_version = '1.8.9'
cairo_version_required = '1.8.8'
pkgconfig_file = 'pycairo.pc'
config_file = 'src/config.h'
diff --git a/src/Makefile.am b/src/Makefile.am
index 2340563..64e7b29 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,5 @@
+EXTRA_DIST = \
+ wscript
pycairoexecdir = $(pyexecdir)/cairo
diff --git a/wscript b/wscript
index c65b75d..ab50ee2 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,8 @@
import os
APPNAME='pycairo'
-VERSION='1.8.8'
+VERSION='1.8.9'
+cairo_version_required = '1.8.8'
srcdir = '.'
blddir = '../%s-build' % APPNAME
@@ -29,7 +30,7 @@ def configure(conf):
conf.check_tool('python')
conf.check_python_version((2,6,0))
conf.check_python_headers()
- conf.check_cfg(package='cairo', atleast_version='1.8.8',
+ conf.check_cfg(package='cairo', atleast_version=cairo_version_required,
args='--cflags --libs')
# add gcc options