Merge ~ahasenack/ubuntu/+source/haproxy:focal-haproxy-py2-explicit into ubuntu/+source/haproxy:ubuntu/devel

[Andreas Hasenack]

python-marko (py2) is back, so we can use it instead of the more complicated option of moving debian/dconv to python3.

PPA with test build: https://launchpad.net/~ahasenack/+archive/ubuntu/haproxy-2.0.12/

DEP8 passes:
(...)
+ echo OK: index.html downloaded via haproxy matches the source file.
+ exit 0
OK: index.html downloaded via haproxy matches the source file.
autopkgtest [11:18:52]: test proxy-localhost: -----------------------]
autopkgtest [11:18:52]: test proxy-localhost: - - - - - - - - - - results - - - - - - - - - -
proxy-localhost PASS
autopkgtest [11:18:52]: @@@@@@@@@@@@@@@@@@@@ summary
cli PASS
proxy-localhost PASS

[Andreas Hasenack (ahasenack)]

I'm not sure if this python -> python2 change can be pushed to debian. Also, I didn't change the debian/dconv/haproxy-dconv.py shebang line to python2 because d/rules calls it explicitly with a python interpreter, which I did change to python2. But I can change it in dconv too if you prefer.

[Andreas Hasenack (ahasenack)]

Note that since debian/dconv isn't shipped with any package (it's just used to build documentation), there is no risk of debhelper mistakenly adding a (incorrect) python dependency.

[Andreas Hasenack (ahasenack)]

Oops, back pedalling on this:
<ahasenack> doko: I'm taking advantage of you reintroducing python-mako (py2), to build haproxy with it (not a runtime dep). Is that why you reintroduced it, or are other packages needing it?
<doko> ahasenack, ginggs: I just removed python2-scipy, so it's not needed for that anymore

review: Disapprove

Unmerged commits

484460d... by Andreas Hasenack on 2020-01-15

changelog

ec0721a... by Andreas Hasenack on 2020-01-15

  * d/rules, d/control: be specific about the python2 build dependency,
    now that python-marko (py2) was re-added (LP: #1858485)

diff --git a/debian/changelog b/debian/changelog
index 8edafe5..b9395b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+haproxy (2.0.12-1ubuntu2) focal; urgency=medium
+
+  * d/rules, d/control: be specific about the python2 build dependency,
+    now that python-marko (py2) was re-added (LP: #1858485)
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 15 Jan 2020 11:19:34 -0300
+
 haproxy (2.0.12-1ubuntu1) focal; urgency=medium
 
   * Merge with Debian unstable. Remaining changes:
diff --git a/debian/control b/debian/control
index d120f6e..4c79d68 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 10),
                libsystemd-dev [linux-any],
                python3-sphinx,
                zlib1g-dev
-Build-Depends-Indep: python, python-mako
+Build-Depends-Indep: python2, python-mako
 Homepage: http://www.haproxy.org/
 Vcs-Git: https://salsa.debian.org/haproxy-team/haproxy.git
 Vcs-Browser: https://salsa.debian.org/haproxy-team/haproxy
diff --git a/debian/rules b/debian/rules
index c7c813b..2558917 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,7 +59,7 @@ override_dh_auto_build-indep:
 	# Build the HTML documentation, after patching dconv
 	patch -p1 < $(CURDIR)/debian/patches/debianize-dconv.patch
 	for doc in intro configuration management; do \
-		python -B $(CURDIR)/debian/dconv/haproxy-dconv.py \
+		python2 -B $(CURDIR)/debian/dconv/haproxy-dconv.py \
 			-i $(CURDIR)/doc/$${doc}.txt \
 			-o $(CURDIR)/doc/$${doc}.html ;\
 	done