silx FTCBFS: unsatisfiable cross Build-Depends

3 files changed, 11 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index a656085..dbe7e2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ silx (0.13.1+dfsg-1) UNRELEASED; urgency=medium
   * New upstream version 0.13.1+dfsg (Closes: #966933)
   * d/control: Standards-Version bumped to 4.1.3 (nothing to do)
   * d/control: Rules-Requires-Root: no
+  * Demote documentation dependencies to B-D-I. (Closes: #946110)
+    Thanks Helmut Grohne for the patch
 
  --
 
diff --git a/debian/control b/debian/control
index 0a858f6..1b5c4c1 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Build-Depends: cython3 (>= 0.23.2),
                dh-python,
                help2man,
                ipython3,
-               pandoc <!nodoc>,
                python3-all-dbg,
                python3-all-dev,
                python3-fabio,
@@ -21,7 +20,6 @@ Build-Depends: cython3 (>= 0.23.2),
                python3-mako,
                python3-matplotlib,
                python3-matplotlib-dbg,
-               python3-nbsphinx <!nodoc>,
                python3-numpy,
                python3-numpy-dbg,
                python3-opengl,
@@ -38,10 +36,13 @@ Build-Depends: cython3 (>= 0.23.2),
                python3-scipy,
                python3-scipy-dbg,
                python3-setuptools,
-               python3-sphinx,
-               python3-sphinxcontrib.programoutput,
                xauth,
                xvfb
+Build-Depends-Indep:
+               pandoc <!nodoc>,
+               python3-nbsphinx <!nodoc>,
+               python3-sphinx,
+               python3-sphinxcontrib.programoutput,
 Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/science-team/silx
 Vcs-Git: https://salsa.debian.org/science-team/silx.git
diff --git a/debian/rules b/debian/rules
index d086f63..19abca1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,8 @@ export PYBUILD_NAME=silx
 export SPECFILE_USE_GNU_SOURCE=1
 export SILX_FULL_INSTALL_REQUIRES=1
 
+DOPACKAGES=$(shell dh_listpackages)
+
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 # Make does not offer a recursive wildcard function, so here's one:
@@ -24,7 +26,8 @@ ALL_PYX := $(call rwildcard,silx/,*.pyx)
 PY3VER := $(shell py3versions -dv)
 
 %:
-	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
+	dh $@ --with python3 $(DH_ADDONS) --buildsystem=pybuild
+build binary %-indep: DH_ADDONS=--with=sphinxdoc
 
 override_dh_clean:
 	dh_clean