Bug#983374: cvxopt: separate documentation dependencies to B-D-I

[Helmut Grohne]

Source: cvxopt
Version: 1.2.5+dfsg-3
Tags: patch
User: debian-cross at lists.debian.org
Usertags: cross-satisfiability

cvxopt cannot be cross built from source, because its Build-Depends are
not satisfiable. It already separates its documentation to a -doc
package and skips the documentation build during an arch-only build,
however it still requires the sphinxdoc addon for arch-only builds and
requires all the documentation dependencies as well. Please consider
applying the attached patch to fully separate them. In the process, I
also dropped the entirely unused texlive-plain-generic and converted
both dh addons to the declarative dependency style.

Helmut
-------------- next part --------------
diff --minimal -Nru cvxopt-1.2.5+dfsg/debian/changelog cvxopt-1.2.5+dfsg/debian/changelog
--- cvxopt-1.2.5+dfsg/debian/changelog	2020-10-15 19:29:19.000000000 +0200
+++ cvxopt-1.2.5+dfsg/debian/changelog	2021-02-23 07:58:41.000000000 +0100
@@ -1,3 +1,10 @@
+cvxopt (1.2.5+dfsg-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Separate documentation dependencies to B-D-I. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Tue, 23 Feb 2021 07:58:41 +0100
+
 cvxopt (1.2.5+dfsg-3) unstable; urgency=medium
 
   * Team upload
diff --minimal -Nru cvxopt-1.2.5+dfsg/debian/control cvxopt-1.2.5+dfsg/debian/control
--- cvxopt-1.2.5+dfsg/debian/control	2020-10-14 14:04:55.000000000 +0200
+++ cvxopt-1.2.5+dfsg/debian/control	2021-02-23 07:58:38.000000000 +0100
@@ -5,24 +5,24 @@
 Testsuite: autopkgtest-pkg-python
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
-               dh-python,
+               dh-sequence-python3,
                dvipng,
                libblas-dev,
                liblapack-dev,
-               python3-sphinx,
-               latexmk,
                libglpk-dev,
                libfftw3-dev,
                libgsl-dev,
                libdsdp-dev,
-               texlive-latex-base,
-               texlive-latex-recommended,
-               texlive-latex-extra,
-               texlive-fonts-recommended,
-               texlive-plain-generic,
                python3-all-dev,
-               python3-sphinx-rtd-theme,
                python3-setuptools
+Build-Depends-Indep: dh-sequence-sphinxdoc,
+                     python3-sphinx,
+                     latexmk,
+                     texlive-latex-base,
+                     texlive-latex-recommended,
+                     texlive-latex-extra,
+                     texlive-fonts-recommended,
+                     python3-sphinx-rtd-theme,
 Standards-Version: 4.5.0
 Rules-Requires-Root: no
 Vcs-Browser: https://salsa.debian.org/science-team/cvxopt
diff --minimal -Nru cvxopt-1.2.5+dfsg/debian/rules cvxopt-1.2.5+dfsg/debian/rules
--- cvxopt-1.2.5+dfsg/debian/rules	2020-10-15 17:28:46.000000000 +0200
+++ cvxopt-1.2.5+dfsg/debian/rules	2021-02-23 07:57:33.000000000 +0100
@@ -8,7 +8,7 @@
 export PYBUILD_TEST_ARGS=-s tests
 
 %:
-	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
+	dh $@ --buildsystem=pybuild
 
 override_dh_auto_clean:
 	dh_auto_clean
@@ -19,11 +19,9 @@
 	find debian/python*-cvxopt -name cvxopt -type d -empty -delete
 
 override_dh_auto_build-indep:
-ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
 	# $(pyrun) 'make --directory=doc html latex'
 	make --directory=doc html latex
 	make --directory=doc/build/latex all-pdf
-endif
 
 override_dh_auto_test-indep: