Build docs using Python 3 version of Sphinx

This commit is contained in:
Ben Hutchings 2018-07-06 21:05:11 +01:00
parent 4634fe38a6
commit 8b0549f036
3 changed files with 11 additions and 2 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
linux (4.18~rc3-1~exp2) UNRELEASED; urgency=medium
* Build docs using Python 3 version of Sphinx
-- Ben Hutchings <ben@decadent.org.uk> Fri, 06 Jul 2018 20:55:47 +0100
linux (4.18~rc3-1~exp1) experimental; urgency=medium
* New upstream release candidate

3
debian/rules.real vendored
View File

@ -212,6 +212,9 @@ $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR):
@$(stamp)
$(STAMPS_DIR)/build-doc: DIR=$(BUILD_DIR)/build-doc
# sphinx commands in /usr/bin are managed by the alternatives system.
# Change $PATH to make sure we consistently use the Python 3 version.
$(STAMPS_DIR)/build-doc: PATH:=/usr/share/sphinx/scripts/python3:$(PATH)
$(STAMPS_DIR)/build-doc: $(STAMPS_DIR)/source
ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
mkdir -p '$(BUILD_DIR)'

View File

@ -61,8 +61,8 @@ Build-Depends-Indep:
patchutils <!stage1>,
# used by upstream to build documentation
graphviz <!stage1 !nodoc>,
python-sphinx <!stage1 !nodoc>,
python-sphinx-rtd-theme <!stage1 !nodoc>,
python3-sphinx <!stage1 !nodoc>,
python3-sphinx-rtd-theme <!stage1 !nodoc>,
Rules-Requires-Root: no
Vcs-Git: https://salsa.debian.org/kernel-team/linux.git
Vcs-Browser: https://salsa.debian.org/kernel-team/linux