Source: pycurl
Version: 7.43.0.6-5
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: cross-satisfiability

pycurl cannot be cross built from source, because its python3-sphinx
dependency is not satisfiable. Since pycurl already split out its
documentation to an arch:all package, it would be good to simply not
require sphinx for arch-only builds and move it to B-D-I where it is
irrelevant to cross builds. To that end, please consider applying the
attached patch.

Helmut
diff --minimal -Nru pycurl-7.43.0.6/debian/changelog 
pycurl-7.43.0.6/debian/changelog
--- pycurl-7.43.0.6/debian/changelog    2021-01-12 21:04:36.000000000 +0100
+++ pycurl-7.43.0.6/debian/changelog    2021-02-03 15:29:44.000000000 +0100
@@ -1,3 +1,10 @@
+pycurl (7.43.0.6-5.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Don't build documentation in archonly build. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Wed, 03 Feb 2021 15:29:44 +0100
+
 pycurl (7.43.0.6-5) unstable; urgency=medium
 
   * Team upload
diff --minimal -Nru pycurl-7.43.0.6/debian/control 
pycurl-7.43.0.6/debian/control
--- pycurl-7.43.0.6/debian/control      2021-01-12 21:04:36.000000000 +0100
+++ pycurl-7.43.0.6/debian/control      2021-02-03 15:29:44.000000000 +0100
@@ -9,13 +9,14 @@
                libgnutls28-dev,
                libssh2-1-dev,
                pyflakes3 <!nocheck>,
-               python3-sphinx,
                python3-all-dbg,
                python3-all-dev,
                python3-bottle <!nocheck>,
                python3-flaky <!nocheck>,
                python3-nose <!nocheck>,
                vsftpd <!nocheck>,
+Build-Depends-Indep: dh-sequence-sphinxdoc,
+                     python3-sphinx,
 Standards-Version: 4.5.0
 X-Python-Version: all
 Homepage: http://pycurl.sourceforge.net
diff --minimal -Nru pycurl-7.43.0.6/debian/python-pycurl-doc.examples 
pycurl-7.43.0.6/debian/python-pycurl-doc.examples
--- pycurl-7.43.0.6/debian/python-pycurl-doc.examples   1970-01-01 
01:00:00.000000000 +0100
+++ pycurl-7.43.0.6/debian/python-pycurl-doc.examples   2021-02-03 
15:29:44.000000000 +0100
@@ -0,0 +1 @@
+examples/*
diff --minimal -Nru pycurl-7.43.0.6/debian/rules pycurl-7.43.0.6/debian/rules
--- pycurl-7.43.0.6/debian/rules        2021-01-12 21:04:36.000000000 +0100
+++ pycurl-7.43.0.6/debian/rules        2021-02-03 15:29:44.000000000 +0100
@@ -12,9 +12,10 @@
 unexport LDFLAGS
 export FFLAGS="-fPIC"
 
+DO_PACKAGES = $(shell dh_listpackages)
 
 %:
-       dh $@ --with python3,sphinxdoc
+       dh $@ --with python3
 
 override_dh_auto_build:
        $(MAKE) gen PYTHON=python3
@@ -23,7 +24,9 @@
                python$$py-dbg setup.py build ; \
        done
        mkdir -p www/htdocs/doc
+ifneq (,$(filter python-pycurl-doc,$(DO_PACKAGES)))
        $(MAKE) docs PYTHON=python3
+endif
 
 override_dh_auto_test:
 ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
@@ -46,12 +49,11 @@
 
 override_dh_installdocs:
        mkdir -p debian/python-pycurl-doc/usr/share/doc/python-pycurl-doc/html
+ifneq (,$(filter python-pycurl-doc,$(DO_PACKAGES)))
        cp -a build/doc/* 
$(CURDIR)/debian/python-pycurl-doc/usr/share/doc/python-pycurl-doc/html
+endif
        dh_installdocs -ppython3-pycurl -ppython3-pycurl-dbg 
--link-doc=python3-pycurl
-       dh_installdocs -ppython-pycurl-doc
-
-override_dh_installexamples:
-       dh_installexamples -ppython-pycurl-doc examples/*
+       dh_installdocs -Npython3-pycurl -Npython3-pycurl-dbg
 
 override_dh_installchangelogs:
        dh_installchangelogs ChangeLog

Reply via email to