Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Fri, 15 Oct 2010 19:52:06 +0200
branchstable
changeset 6521 8c8529db5f83
parent 6519 e7047cc49f4d (current diff)
parent 6520 07a0f93f499a (diff)
child 6522 c46b3b3291e8
child 6534 eb8dd7b0bd9d
merge
--- a/debian/control	Fri Oct 15 19:51:01 2010 +0200
+++ b/debian/control	Fri Oct 15 19:52:06 2010 +0200
@@ -7,7 +7,7 @@
            Adrien Di Mascio <Adrien.DiMascio@logilab.fr>,
            Aurélien Campéas <aurelien.campeas@logilab.fr>,
            Nicolas Chauvat <nicolas.chauvat@logilab.fr>
-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
--- a/debian/cubicweb-documentation.install.in	Fri Oct 15 19:51:01 2010 +0200
+++ b/debian/cubicweb-documentation.install.in	Fri Oct 15 19:52:06 2010 +0200
@@ -1,1 +1,2 @@
+doc/book usr/share/doc/cubicweb-documentation
 debian/cubicweb-doc usr/share/doc-base/cubicweb-doc
--- a/debian/rules	Fri Oct 15 19:51:01 2010 +0200
+++ b/debian/rules	Fri Oct 15 19:52:06 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
cubicweb