summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2020-01-10 10:09:48 +0000
committerSimon McVittie <smcv@debian.org>2020-01-10 10:09:49 +0000
commitdd4381042d6adfb0b1a354ba60cb5676e22bdf97 (patch)
tree7cb8bf6dd5c5b43e929f03b3077971fe0c30e322 /debian
parentf6b76fd14cbb371d1c50df9d583162405741a72a (diff)
Only use sphinxdoc debhelper sequence when building Architecture: all packages
Thanks: Helmut Grohne Closes: #946212
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/control1
-rwxr-xr-xdebian/rules3
3 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index e242b48..8fa02b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ dbus-python (1.2.14-2) UNRELEASED; urgency=medium
in Debian 8 'jessie'
* python-dbus-dbg: Depend on python2-dbg instead of python-dbg.
Thanks to Matthias Klose.
+ * Only use sphinxdoc debhelper sequence when building Architecture: all
+ packages. Thanks to Helmut Grohne. (Closes: #946212)
-- Simon McVittie <smcv@debian.org> Sun, 05 Jan 2020 15:19:32 +0000
diff --git a/debian/control b/debian/control
index d3bebdd..728e93b 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,6 @@ Build-Depends:
python3-all-dev,
python3-gi,
python3-tap <!nocheck>,
- sphinx-common,
xmlto,
Build-Depends-Indep:
python3-sphinx,
diff --git a/debian/rules b/debian/rules
index 6a4a078..83eb5cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,8 @@ PYDEFAULTVER := $(shell py3versions --default --version)
FLAVOURS := $(patsubst %,%-dbg,$(PYTHON2) $(PYTHON3)) $(PYTHON2) $(PYTHON3)
%:
- dh $@ --with sphinxdoc --buildsystem=autoconf
+ dh $@ $(DH_ADDONS) --buildsystem=autoconf
+build binary %-indep: DH_ADDONS=--with=sphinxdoc
# The special case for 2.7-dbg is a workaround. Python 2 doesn't have the
# LDVERSION sysconfig variable, which would give AX_PYTHON_DEVEL the