Bug#945345: therion: Missing build-dep on python; build-depend on python3 instead

2019-11-23 Thread Olly Betts
On Fri, Nov 22, 2019 at 11:30:00PM -0800, Steve Langasek wrote:
> Rather than adding a build-dependency on python, which is deprecated, I have
> attached a patch which moves the invocation to python3 instead and added a
> build-dependency on python3.

I do wish upstream would pick a scripting language.  There are scripts
in python, perl and tcl.

Feel free to NMU your fix.

Cheers,
Olly



Bug#945345: therion: Missing build-dep on python; build-depend on python3 instead

2019-11-22 Thread Steve Langasek
Package: therion
Version: 5.4.4ds1-2
Severity: serious
Tags: patch
Justification: FTBFS
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Dear maintainers,

The therion package fails to build from source in Debian unstable in a clean
buildd environment, because the upstream makefile invokes python but therion
does not build-depend on it, so now that its various build-dependencies have
moved away from python to python3, this invocation fails:

[...]
# Compile the binaries
/usr/bin/make therion xtherion/xtherion loch/loch
make[2]: Entering directory '/<>'
python set_version.py
make[2]: python: Command not found
[...]

  
(https://launchpad.net/ubuntu/+source/therion/5.4.4ds1-2build1/+build/17978786)

Rather than adding a build-dependency on python, which is deprecated, I have
attached a patch which moves the invocation to python3 instead and added a
build-dependency on python3.

I have also uploaded this change to Ubuntu, where the problem was first
discovered.

Cheers,
-- 
Steve Langasek   Give me a lever long enough and a Free OS
Debian Developer   to set it on, and I can move the world.
Ubuntu Developer   https://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
diff -Nru therion-5.4.4ds1/debian/control therion-5.4.4ds1/debian/control
--- therion-5.4.4ds1/debian/control 2019-09-16 21:58:01.0 -0700
+++ therion-5.4.4ds1/debian/control 2019-11-22 22:13:29.0 -0800
@@ -5,7 +5,7 @@
 Uploaders: Olly Betts 
 Build-Depends: dpkg (>=1.16.2), debhelper (>= 10), perl (>= 5.5), tcl,
   libvtk6-dev, libwxgtk3.0-gtk3-dev, libfreetype6-dev, libjpeg-dev, libpng-dev,
-  pkg-config, texlive-base, libproj-dev, libsqlite3-tcl
+  pkg-config, texlive-base, libproj-dev, libsqlite3-tcl, python3
 Build-Depends-Indep: texlive-metapost, imagemagick, ghostscript
 Standards-Version: 4.4.0
 Homepage: https://therion.speleo.sk/
diff -Nru therion-5.4.4ds1/debian/patches/python3-not-python.patch 
therion-5.4.4ds1/debian/patches/python3-not-python.patch
--- therion-5.4.4ds1/debian/patches/python3-not-python.patch1969-12-31 
16:00:00.0 -0800
+++ therion-5.4.4ds1/debian/patches/python3-not-python.patch2019-11-22 
22:13:19.0 -0800
@@ -0,0 +1,18 @@
+Description: Use python3 at build time, not python.
+ This package previously built successfully because python happened to be
+ installed in the environment, but now that everything is moving to python3
+ it is not.  Invoke python3 instead of the deprecated python.
+Author: Steve Langasek 
+Last-Update: 2019-11-23
+
+--- therion-5.4.4ds1.orig/Makefile
 therion-5.4.4ds1/Makefile
+@@ -175,7 +175,7 @@ outdirs:
+   mkdir -p $(OUTDIR)/thbook
+ 
+ version:
+-  python set_version.py
++  python3 set_version.py
+ 
+ 
+ $(OUTDIR)/therion: version $(OBJECTS)
diff -Nru therion-5.4.4ds1/debian/patches/series 
therion-5.4.4ds1/debian/patches/series
--- therion-5.4.4ds1/debian/patches/series  2019-07-07 16:52:56.0 
-0700
+++ therion-5.4.4ds1/debian/patches/series  2019-11-22 22:11:59.0 
-0800
@@ -1,3 +1,4 @@
 10doc-fixes.patch
 80debianise-makefiles.patch
 90debianise-loch-makefile.patch
+python3-not-python.patch