# HG changeset patch # User Sylvain Thénault # Date 1287152448 -7200 # Node ID 75f9f016adda7bea7ff1f1450bb0600e9dd269c1 # Parent b06310fc4e231a39f09527a6f570fc1d7ce75efe# Parent 1f8b902f31439c363a7ad0539feb38dc57931df0 backport stable diff -r b06310fc4e23 -r 75f9f016adda debian/control --- a/debian/control Fri Oct 15 12:09:11 2010 +0200 +++ b/debian/control Fri Oct 15 16:20:48 2010 +0200 @@ -7,7 +7,7 @@ Adrien Di Mascio , Aurélien Campéas , Nicolas Chauvat -Build-Depends: debhelper (>= 5), python-dev (>=2.5), python-central (>= 0.5) +Build-Depends: debhelper (>= 5), python-dev (>=2.5), python-central (>= 0.5), python-sphinx, logilab-doctools Standards-Version: 3.8.0 Homepage: http://www.cubicweb.org XS-Python-Version: >= 2.5, << 2.7 diff -r b06310fc4e23 -r 75f9f016adda debian/cubicweb-documentation.install.in --- a/debian/cubicweb-documentation.install.in Fri Oct 15 12:09:11 2010 +0200 +++ b/debian/cubicweb-documentation.install.in Fri Oct 15 16:20:48 2010 +0200 @@ -1,2 +1,1 @@ -doc/book usr/share/doc/cubicweb-documentation debian/cubicweb-doc usr/share/doc-base/cubicweb-doc diff -r b06310fc4e23 -r 75f9f016adda debian/rules --- a/debian/rules Fri Oct 15 12:09:11 2010 +0200 +++ b/debian/rules Fri Oct 15 16:20:48 2010 +0200 @@ -38,6 +38,8 @@ # Put all the python library and data in cubicweb-common # and scripts in cubicweb-server + # build doc + BUILDDIR=${PWD}/debian/tmp/cubicweb-book/en make -e -C doc/book/en html dh_install -vi # cwctl in the cubicweb-ctl package rm -f debian/cubicweb-common/usr/share/pyshared/cubicweb/cwctl.py diff -r b06310fc4e23 -r 75f9f016adda doc/book/en/conf.py --- a/doc/book/en/conf.py Fri Oct 15 12:09:11 2010 +0200 +++ b/doc/book/en/conf.py Fri Oct 15 16:20:48 2010 +0200 @@ -32,8 +32,16 @@ # serve to show the default value. import sys, os +from os import path as osp -from cubicweb import __pkginfo__ as cw +path = __file__ +path = osp.dirname(path) #./doc/book/en +path = osp.dirname(path) #./doc/book/ +path = osp.dirname(path) #./doc/ +path = osp.dirname(path) #./ +path = osp.join(path,'__pkginfo__.py') #./__pkginfo__.py +cw = {} +execfile(path,{},cw) # If your extensions are in another directory, add it here. If the directory # is relative to the documentation root, use os.path.abspath to make it @@ -64,9 +72,9 @@ # other places throughout the built documents. # # The short X.Y version. -version = '.'.join(str(n) for n in cw.numversion[:2]) +version = '.'.join(str(n) for n in cw['numversion'][:2]) # The full version, including alpha/beta/rc tags. -release = cw.version +release = cw['version'] # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: