summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBodo-Merle Sandor <sbodomerle@gmail.com>2019-12-04 18:58:43 +0100
committerBodo-Merle Sandor <sbodomerle@gmail.com>2019-12-04 19:06:03 +0100
commitc8521565bc92ce7cb40e9b90c7b1473849b330ec (patch)
tree253f91e771cbf94c0e4951393f9fa748c80668b4
parentb4a68bd2cbc02c17a6dfe1689471ea6983fa28c8 (diff)
Demote documentation dependencies to B-D-I. (Closes: #946135)
Apply patch by Helmut Grohne: pytango cannot satisfy its cross Build-Depends. One reason for that is its documentation dependencies. However, since the documentation is shipped in an architecture:all package, it shouldn't be needed for performing an arch-only build. So these dependencies should be sufficient in Build-Depend-Indep where they stop mattering for cross builds. It also drops the <!nodoc> build profile, because it is not needed. For pytango, performing a build without documentation simply becomes an arch-only build.
-rw-r--r--debian/changelog7
-rw-r--r--debian/control11
-rwxr-xr-xdebian/rules5
3 files changed, 15 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog
index 984aac8..052dbc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pytango (9.3.0-4) UNRELEASED; urgency=medium
+
+ [ Helmut Grohne ]
+ * Demote documentation dependencies to B-D-I. (Closes: #946135)
+
+ -- Sandor Bodo-Merle <sbodomerle@gmail.com> Wed, 04 Dec 2019 19:03:53 +0100
+
pytango (9.3.0-3) unstable; urgency=medium
[ Bodo-Merle Sandor ]
diff --git a/debian/control b/debian/control
index ea0899f..245cb2e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,20 +6,21 @@ Section: science
Priority: optional
Build-Depends: debhelper-compat (= 12),
dh-python,
- graphviz <!nodoc>,
libboost-python-dev,
libtango-dev,
pkg-config,
python3-all-dev,
python3-distro,
- python3-gevent <!nodoc>,
- python3-mock <!nodoc>,
python3-numpy,
python3-setuptools,
python3-six,
- python3-sphinx <!nodoc>,
- python3-sphinx-rtd-theme <!nodoc>,
sphinx-common
+Build-Depends-Indep:
+ graphviz,
+ python3-gevent,
+ python3-mock,
+ python3-sphinx,
+ python3-sphinx-rtd-theme,
Standards-Version: 4.4.1
Vcs-Browser: https://salsa.debian.org/science-team/pytango
Vcs-Git: https://salsa.debian.org/science-team/pytango.git
diff --git a/debian/rules b/debian/rules
index e3f55a2..6c901d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,11 +13,10 @@ override_dh_auto_clean:
rm -rf *.egg-info
rm -rf build
-override_dh_sphinxdoc:
-ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
+override_dh_sphinxdoc-arch:
+override_dh_sphinxdoc-indep:
PYBUILD_SYSTEM=custom \
PYBUILD_BUILD_ARGS="PYTHONPATH={build_dir} {interpreter} -m sphinx -N -bhtml doc build/html" dh_auto_build # HTML generator
dh_installdocs "build/html" -p python-tango-doc
dh_installdocs "examples" -p python-tango-doc
dh_sphinxdoc -O--buildsystem=pybuild
-endif