# HG changeset patch # User Sylvain Thénault # Date 1287165112 -7200 # Node ID 07a0f93f499a77c02c07097e82f6f96cd4dd4d12 # Parent 1f8b902f31439c363a7ad0539feb38dc57931df0 Backed out changeset 1f8b902f3143: this block compilation under distrib with old sphinx package diff -r 1f8b902f3143 -r 07a0f93f499a debian/control --- a/debian/control Fri Oct 15 16:20:27 2010 +0200 +++ b/debian/control Fri Oct 15 19:51:52 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), python-sphinx, logilab-doctools +Build-Depends: debhelper (>= 5), python-dev (>=2.5), python-central (>= 0.5) Standards-Version: 3.8.0 Homepage: http://www.cubicweb.org XS-Python-Version: >= 2.5, << 2.7 diff -r 1f8b902f3143 -r 07a0f93f499a debian/cubicweb-documentation.install.in --- a/debian/cubicweb-documentation.install.in Fri Oct 15 16:20:27 2010 +0200 +++ b/debian/cubicweb-documentation.install.in Fri Oct 15 19:51:52 2010 +0200 @@ -1,1 +1,2 @@ +doc/book usr/share/doc/cubicweb-documentation debian/cubicweb-doc usr/share/doc-base/cubicweb-doc diff -r 1f8b902f3143 -r 07a0f93f499a debian/rules --- a/debian/rules Fri Oct 15 16:20:27 2010 +0200 +++ b/debian/rules Fri Oct 15 19:51:52 2010 +0200 @@ -38,8 +38,6 @@ # 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