Bug#983112: cheetah: reduce Build-Depends

2021-02-22 Thread Jeroen Ploemen
Control: tag -1 + confirmed pending

Thanks for your report, (the essence of) your patch has been merged into
the cheetah packaging on git:
https://salsa.debian.org/python-team/packages/cheetah/-/commit/887722262dbf3fa8f5dcb03bedaf9adf1afcdc8a


pgpdtVfkmarOY.pgp
Description: OpenPGP digital signature


Bug#983112: cheetah: reduce Build-Depends

2021-02-19 Thread Helmut Grohne
Source: cheetah
Version: 3.2.6-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: cross-satisfiability

cheetah cannot be cross built from source, because its Build-Depends are
not satisfiable. Instead of looking into such a difficult problem, I
looked for easily droppable build dependencies. While the nodoc
option/profile is nice to have, it also is unnecessary if the arch/indep
split is properly implemented. A nodoc build simply becomes an arch-only
build. To make that happen, the sphinx addon must be skipped for
arch-only builds. An easy way to do that is to request addons via build
dependencies on dh-sequence-* and move it to B-D-I. Beyond that, the
python3-markdown dependency is only required for testing and can thus be
annotated . Please consider applying the attached patch (post
bullseye).

Helmut
diff --minimal -Nru cheetah-3.2.6/debian/changelog 
cheetah-3.2.6/debian/changelog
--- cheetah-3.2.6/debian/changelog  2020-10-08 08:54:00.0 +0200
+++ cheetah-3.2.6/debian/changelog  2021-02-19 13:15:04.0 +0100
@@ -1,3 +1,14 @@
+cheetah (3.2.6-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Reduce Build-Depends: (Closes: #-1)
++ Convert dh --with to B-D: dh-sequence.
++ Replace nodoc option/profile with indep condition.
++ Move sphinx dependencies to B-D-I.
++ Annotate python3-markdown dependency .
+
+ -- Helmut Grohne   Fri, 19 Feb 2021 13:15:04 +0100
+
 cheetah (3.2.6-1) unstable; urgency=medium
 
   [ JCF Ploemen (jcfp) ]
diff --minimal -Nru cheetah-3.2.6/debian/control cheetah-3.2.6/debian/control
--- cheetah-3.2.6/debian/control2020-10-08 08:54:00.0 +0200
+++ cheetah-3.2.6/debian/control2021-02-19 13:14:20.0 +0100
@@ -5,11 +5,13 @@
 Uploaders: Debian Python Modules Team 

 Build-Depends:
  debhelper-compat (= 12),
- dh-python,
+ dh-sequence-python3,
  python3-all-dev,
- python3-markdown,
+ python3-markdown ,
  python3-pygments,
  python3-setuptools,
+Build-Depends-Indep:
+ dh-sequence-sphinxdoc,
  python3-sphinx
 Standards-Version: 4.5.0
 Homepage: http://www.cheetahtemplate.org/
diff --minimal -Nru cheetah-3.2.6/debian/rules cheetah-3.2.6/debian/rules
--- cheetah-3.2.6/debian/rules  2020-10-08 08:54:00.0 +0200
+++ cheetah-3.2.6/debian/rules  2021-02-19 13:15:02.0 +0100
@@ -6,14 +6,11 @@
 export PYBUILD_NAME=cheetah
 
 %:
-   dh $@ --with python3,sphinxdoc --buildsys=pybuild
+   dh $@ --buildsys=pybuild
 
 
-override_dh_auto_install:
-   dh_auto_install
-ifeq ($(filter nodoc,$(DEB_BUILD_OPTIONS))$(filter 
nodoc,$(DEB_BUILD_PROFILES)),)
+execute_after_dh_auto_install-indep:
PYTHONPATH=$(CURDIR) $(MAKE) -i -C docs html
-endif
 
 execute_after_dh_auto_clean:
PYTHONPATH=$(CURDIR) $(MAKE) -i -C docs clean