[debian] build the book with no auto-compression of book files (closes: #1906581)

Book content paths (html and rest) are now excluded from Debian compression step. This will fix a documentation search issue on the website (doc.cubicweb.org)

Documentation build is now made optional since it can break for old distributions and we don't want to block a new release of Cubicweb because of documentation issues.

authorJulien Jehannet <julien.jehannet@logilab.fr>
changeset07c74f5585d1
branchstable
phasepublic
hiddenno
parent revision#a832677c0aa6 [views/navigation] use the proper icons instead of ascii art (closes #1624943)
child revision#bd44f506ca86 closes #1914824: fix retrieval of _andor input, test and fix generated rql
files modified by this revision
debian/control
debian/rules
# HG changeset patch
# User Julien Jehannet <julien.jehannet@logilab.fr>
# Date 1315388261 -7200
# Wed Sep 07 11:37:41 2011 +0200
# Branch stable
# Node ID 07c74f5585d1b09c9de705debcfbada3d4fa8f89
# Parent a832677c0aa69a6d139f80b8651336deb20c4003
[debian] build the book with no auto-compression of book files (closes: #1906581)

Book content paths (html and rest) are now excluded from Debian compression step.
This will fix a documentation search issue on the website (doc.cubicweb.org)

Documentation build is now made optional since it can break for old distributions
and we don't want to block a new release of Cubicweb because of documentation issues.

diff --git a/debian/control b/debian/control
@@ -5,13 +5,13 @@ 
1  Uploaders: Sylvain Thenault <sylvain.thenault@logilab.fr>,
2             Julien Jehannet <julien.jehannet@logilab.fr>,
3             Adrien Di Mascio <Adrien.DiMascio@logilab.fr>,
4             Aurélien Campéas <aurelien.campeas@logilab.fr>,
5             Nicolas Chauvat <nicolas.chauvat@logilab.fr>
6 -Build-Depends: debhelper (>= 7), python (>= 2.5), python-central (>= 0.5)
7 +Build-Depends: debhelper (>= 7), python (>= 2.5), python-central (>= 0.5), python-sphinx
8  # for the documentation:
9 -# python-sphinx, python-logilab-common, python-unittest2,
10 +# python-sphinx, python-logilab-common, python-unittest2, logilab-doctools, logilab-xml
11  Standards-Version: 3.9.1
12  Homepage: http://www.cubicweb.org
13  XS-Python-Version: >= 2.5, << 2.7
14 
15  Package: cubicweb
diff --git a/debian/rules b/debian/rules
@@ -8,18 +8,15 @@ 
16  PY_VERSION:=$(shell pyversions -d)
17 
18  build: build-stamp
19  build-stamp:
20  	dh_testdir
21 -	# XXX doesn't work if logilab-doctools, logilab-xml are not in build depends
22 -	# and I can't get pbuilder find them in its chroot :(
23 -	# cd doc && make
24 -	# FIXME cleanup and use sphinx-build as build-depends ?
25  	NO_SETUPTOOLS=1 python setup.py build
26 -	# XXX uncomment this and associated build-depends in control
27 -	#when necessary sphinx version is in all built distribution
28 -	#PYTHONPATH=$(CURDIR)/.. $(MAKE) -C doc/book/en all
29 +	# documentation build is now made optional since it can break for old
30 +	# distributions and we don't want to block a new release of Cubicweb
31 +	# because of documentation issues.
32 +	-PYTHONPATH=$(CURDIR)/.. $(MAKE) -C doc/book/en all
33  	touch build-stamp
34 
35  clean:
36  	dh_testdir
37  	dh_testroot
@@ -71,11 +68,11 @@ 
38  	dh_installlogrotate -i
39  	dh_installdocs -i -A README
40  	dh_installman -i
41  	dh_installchangelogs -i
42  	dh_link -i
43 -	dh_compress -i -X.py -X.ini -X.xml
44 +	dh_compress -i -X.py -X.ini -X.xml -X.js -X.rst
45  	dh_fixperms -i
46  	dh_installdeb -i
47  	dh_gencontrol  -i
48  	dh_md5sums -i
49  	dh_builddeb -i