From 8b0549f0363197d93243bd5475c94018077c5cd8 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 6 Jul 2018 21:05:11 +0100 Subject: [PATCH] Build docs using Python 3 version of Sphinx --- debian/changelog | 6 ++++++ debian/rules.real | 3 +++ debian/templates/control.source.in | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6bed089da..2b2194938 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +linux (4.18~rc3-1~exp2) UNRELEASED; urgency=medium + + * Build docs using Python 3 version of Sphinx + + -- Ben Hutchings Fri, 06 Jul 2018 20:55:47 +0100 + linux (4.18~rc3-1~exp1) experimental; urgency=medium * New upstream release candidate diff --git a/debian/rules.real b/debian/rules.real index 82ecf081a..20619c698 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -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)' diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in index d3069aae9..052303468 100644 --- a/debian/templates/control.source.in +++ b/debian/templates/control.source.in @@ -61,8 +61,8 @@ Build-Depends-Indep: patchutils , # used by upstream to build documentation graphviz , - python-sphinx , - python-sphinx-rtd-theme , + python3-sphinx , + python3-sphinx-rtd-theme , Rules-Requires-Root: no Vcs-Git: https://salsa.debian.org/kernel-team/linux.git Vcs-Browser: https://salsa.debian.org/kernel-team/linux