Package: git
Version: 1:2.24.0-1
Severity: serious
Tags: patch
Justification: FTBFS
Usertags: origin-ubuntu focal ubuntu-patch

Dear maintainers,

With the impending removal of /usr/bin/python and the python package in
favor of /usr/bin/python2 (shipped by 'python2'), git will start to fail to
build due to trying to invoke /usr/bin/python in the testsuite.

The attached patch fixes the build failure in Ubuntu, where python has
already been dropped in favor of python2.

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                                                    
diff -Nru git-2.24.0/debian/control git-2.24.0/debian/control
--- git-2.24.0/debian/control   2019-11-13 03:50:30.000000000 -0800
+++ git-2.24.0/debian/control   2020-01-13 07:04:49.000000000 -0800
@@ -7,7 +7,7 @@
  libpcre2-dev | libpcre3-dev,
  libcurl4-gnutls-dev, libexpat1-dev,
  subversion, libsvn-perl, libyaml-perl,
- tcl, python,
+ tcl, python2,
  libhttp-date-perl | libtime-parsedate-perl,
diff -Nru git-2.24.0/debian/rules git-2.24.0/debian/rules
--- git-2.24.0/debian/rules     2019-11-13 03:50:30.000000000 -0800
+++ git-2.24.0/debian/rules     2020-01-13 07:04:49.000000000 -0800
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
+export PYTHON_PATH=/usr/bin/python2
 CC =gcc
 CPPFLAGS :=$(shell dpkg-buildflags --get CPPFLAGS)
 CFLAGS :=-Wall $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)

Reply via email to