[Debian-astro-maintainers] Bug#983280: cpl-plugin-xshoo: demote sphinx dependency to B-D-I

[Helmut Grohne]

Source: cpl-plugin-xshoo
Version: 3.5.0+dfsg-1
Tags: patch
User: debian-cross at lists.debian.org
Usertags: cross-satisfiability

cpl-plugin-xshoo cannot be cross built from source, because its sphinx
dependency is not satisfiable. Since the documentation is already split
to an arch:all package and the documentation is only built during an
arch-only build, all that needs doing is restricting the usage of the
shpinxdoc addon to the indep part. Please consider applying the attached
patch.

Helmut
-------------- next part --------------
diff --minimal -Nru cpl-plugin-xshoo-3.5.0+dfsg/debian/changelog cpl-plugin-xshoo-3.5.0+dfsg/debian/changelog
--- cpl-plugin-xshoo-3.5.0+dfsg/debian/changelog	2020-07-01 09:03:17.000000000 +0200
+++ cpl-plugin-xshoo-3.5.0+dfsg/debian/changelog	2021-02-21 22:34:11.000000000 +0100
@@ -1,3 +1,10 @@
+cpl-plugin-xshoo (3.5.0+dfsg-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Request sphinxdoc addon via B-D-I. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Sun, 21 Feb 2021 22:34:11 +0100
+
 cpl-plugin-xshoo (3.5.0+dfsg-1) unstable; urgency=low
 
   * New upstream version 3.5.0+dfsg. Rediff patches
diff --minimal -Nru cpl-plugin-xshoo-3.5.0+dfsg/debian/control cpl-plugin-xshoo-3.5.0+dfsg/debian/control
--- cpl-plugin-xshoo-3.5.0+dfsg/debian/control	2020-07-01 09:02:38.000000000 +0200
+++ cpl-plugin-xshoo-3.5.0+dfsg/debian/control	2021-02-21 22:34:09.000000000 +0100
@@ -9,7 +9,8 @@
                python3,
                python3-astropy,
                python3-cpl,
-               python3-sphinx
+Build-Depends-Indep: dh-sequence-sphinxdoc,
+                     python3-sphinx
 Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/debian-astro-team/cpl-plugin-xshoo
 Vcs-Git: https://salsa.debian.org/debian-astro-team/cpl-plugin-xshoo.git
diff --minimal -Nru cpl-plugin-xshoo-3.5.0+dfsg/debian/rules cpl-plugin-xshoo-3.5.0+dfsg/debian/rules
--- cpl-plugin-xshoo-3.5.0+dfsg/debian/rules	2020-07-01 09:02:38.000000000 +0200
+++ cpl-plugin-xshoo-3.5.0+dfsg/debian/rules	2021-02-21 22:33:57.000000000 +0100
@@ -11,7 +11,7 @@
 	sh ./debian/repackage.sh
 
 %:
-	dh  $@ --with sphinxdoc
+	dh  $@
 
 debian_files:
 	if [ -d calib/cal ] ; then \
@@ -40,11 +40,6 @@
 	sphinx-build sphinx sphinx/html
 	dh_installdocs
 
-override_dh_sphinxdoc:
-	if [ -d sphinx ] ; then \
-		dh_sphinxdoc ; \
-	fi
-
 override_dh_clean:
 	dh_clean
 	rm -rf debian/${DEB_SOURCE}.install \