[Python-modules-team] Bug#982962: bottleneck: implement proper arch/indep split

Helmut Grohne helmut at subdivi.de
Wed Feb 17 13:23:05 GMT 2021


Source: bottleneck
Version: 1.2.1+ds1-2
Tags: patch
User: debian-cross at lists.debian.org
Usertags: cross-satisfiability

bottleneck cannot be cross built from source, because its documentation
dependencies are not satisfiable. It nicely splits its documentation to
an arch:all package and even has a nodoc package, but still the
dependencies are unsatisfiable. The nodoc profile is actually quite
useless here, because an arch-only build does not emit the documentation
already. The one thing that is missing is not generating it during an
arch-only build. Please consider applying the attached patch.

Helmut
-------------- next part --------------
diff --minimal -Nru bottleneck-1.2.1+ds1/debian/changelog bottleneck-1.2.1+ds1/debian/changelog
--- bottleneck-1.2.1+ds1/debian/changelog	2019-08-25 08:44:51.000000000 +0200
+++ bottleneck-1.2.1+ds1/debian/changelog	2021-02-17 14:07:12.000000000 +0100
@@ -1,3 +1,10 @@
+bottleneck (1.2.1+ds1-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Replace nodoc profile with a proper arch/indep split. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Wed, 17 Feb 2021 14:07:12 +0100
+
 bottleneck (1.2.1+ds1-2) unstable; urgency=medium
 
   * Team upload.
diff --minimal -Nru bottleneck-1.2.1+ds1/debian/control bottleneck-1.2.1+ds1/debian/control
--- bottleneck-1.2.1+ds1/debian/control	2019-08-25 08:44:51.000000000 +0200
+++ bottleneck-1.2.1+ds1/debian/control	2021-02-17 14:04:27.000000000 +0100
@@ -12,10 +12,10 @@
                python3-nose <!nocheck>,
                python3-numpy (>= 1:1.14.3-1~),
                python3-numpy-dbg,
-               python3-numpydoc <!nodoc>,
                python3-setuptools,
-               python3-sphinx <!nodoc>,
-               sphinx-common
+Build-Depends-Indep: dh-sequence-sphinxdoc,
+                     python3-numpydoc,
+                     python3-sphinx,
 Standards-Version: 4.1.1
 Vcs-Browser: https://salsa.debian.org/python-team/modules/bottleneck
 Vcs-Git: https://salsa.debian.org/python-team/modules/bottleneck.git
@@ -26,7 +26,7 @@
 Depends: ${misc:Depends},
          ${python3:Depends},
          ${shlibs:Depends}
-Suggests: python-bottleneck-doc <!nodoc>
+Suggests: python-bottleneck-doc
 Enhances: python3-pandas
 Description: Fast NumPy array functions written in C (Python 3)
  Bottleneck is a collection of fast NumPy array functions written in C.
@@ -68,4 +68,3 @@
  functions.
  .
  This package provides the documentation for bottleneck.
-Build-Profiles: <!nodoc>
diff --minimal -Nru bottleneck-1.2.1+ds1/debian/rules bottleneck-1.2.1+ds1/debian/rules
--- bottleneck-1.2.1+ds1/debian/rules	2019-08-25 08:44:51.000000000 +0200
+++ bottleneck-1.2.1+ds1/debian/rules	2021-02-17 14:07:09.000000000 +0100
@@ -10,23 +10,18 @@
 export DH_ALWAYS_EXCLUDE=LICENSE
 
 %:
-	dh $@ --with python3,numpy3,sphinxdoc --buildsystem=pybuild
+	dh $@ --with python3,numpy3 --buildsystem=pybuild
 
 override_dh_auto_clean:
 	dh_auto_clean
-ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
 	find bottleneck -type f -name "*.so" -delete
 	$(RM) -rf build/sphinx
-endif
 
-override_dh_auto_build: export http_proxy=127.0.0.1:9
-override_dh_auto_build: export https_proxy=127.0.0.1:9
-override_dh_auto_build:
-	dh_auto_build
-ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
+override_dh_auto_build-indep: export http_proxy=127.0.0.1:9
+override_dh_auto_build-indep: export https_proxy=127.0.0.1:9
+override_dh_auto_build-indep:
 	python3 setup.py build_ext --inplace
 	PYTHONPATH=. python3 setup.py build_sphinx
-endif
 
 override_dh_installchangelogs:
 	dh_installchangelogs RELEASE.rst


More information about the Python-modules-team mailing list