diff -Nru apr-1.6.5/debian/changelog apr-1.6.5/debian/changelog --- apr-1.6.5/debian/changelog 2020-02-18 14:53:35.000000000 +0000 +++ apr-1.6.5/debian/changelog 2020-07-03 07:34:55.000000000 +0000 @@ -1,11 +1,8 @@ -apr (1.6.5-1ubuntu1) focal; urgency=medium +apr (1.6.5-1+ubuntu20.04.1+deb.sury.org+1) focal; urgency=medium - * FTBFS fixes: - - Build-Depends explicitly on python2, not python. - - d/p/python2.patch: use python2 in command invocations, not the generic - python name. + * No-change backport to focal - -- Robie Basak Tue, 18 Feb 2020 14:53:35 +0000 + -- Ondřej Surý Fri, 03 Jul 2020 09:34:55 +0200 apr (1.6.5-1) unstable; urgency=medium diff -Nru apr-1.6.5/debian/compat apr-1.6.5/debian/compat --- apr-1.6.5/debian/compat 2018-11-19 12:13:02.000000000 +0000 +++ apr-1.6.5/debian/compat 2018-11-19 12:28:03.000000000 +0000 @@ -1 +1 @@ -11 +10 diff -Nru apr-1.6.5/debian/control apr-1.6.5/debian/control --- apr-1.6.5/debian/control 2020-02-17 17:34:12.000000000 +0000 +++ apr-1.6.5/debian/control 2018-11-19 12:28:03.000000000 +0000 @@ -1,10 +1,9 @@ Source: apr Section: libs Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Apache Maintainers +Maintainer: Debian Apache Maintainers Uploaders: Stefan Fritsch -Build-Depends: debhelper (>= 11), autoconf, mawk, uuid-dev, doxygen, netbase, net-tools, libtool (>= 2), python2:any, libsctp-dev [linux-any] +Build-Depends: debhelper (>= 9.20150101), autoconf, autotools-dev, mawk, uuid-dev, doxygen, netbase, net-tools, libtool (>= 2), python:any, libsctp-dev [linux-any] Standards-Version: 4.2.1 Vcs-Browser: https://salsa.debian.org/apache-team/apr Vcs-Git: https://salsa.debian.org/apache-team/apr.git diff -Nru apr-1.6.5/debian/gbp.conf apr-1.6.5/debian/gbp.conf --- apr-1.6.5/debian/gbp.conf 2018-11-19 12:13:02.000000000 +0000 +++ apr-1.6.5/debian/gbp.conf 2018-11-19 12:28:03.000000000 +0000 @@ -1,3 +1,3 @@ [DEFAULT] pristine-tar = True -builder=dpkg-buildpackage -i\.git -I.git +builder = dpkg-buildpackage -i\\.git -I.git diff -Nru apr-1.6.5/debian/patches/python2.patch apr-1.6.5/debian/patches/python2.patch --- apr-1.6.5/debian/patches/python2.patch 2020-02-18 14:33:04.000000000 +0000 +++ apr-1.6.5/debian/patches/python2.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -Author: Robie Basak -Description: use explicit Python shebangs - /usr/bin/python is no longer guaranteed to be Python 2, so use the python2 - binary name instead. -Bug: https://bz.apache.org/bugzilla/show_bug.cgi?id=64154 -Last-Update: 2020-02-18 - ---- a/build/gen-build.py -+++ b/build/gen-build.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # - # USAGE: gen-build.py TYPE - # ---- a/build/buildcheck.sh -+++ b/build/buildcheck.sh -@@ -4,7 +4,7 @@ - res=0 - - # any python --python=`build/PrintPath python` -+python=`build/PrintPath python2` - if test -z "$python"; then - echo "buildconf: python not found." - echo " You need python installed" diff -Nru apr-1.6.5/debian/patches/series apr-1.6.5/debian/patches/series --- apr-1.6.5/debian/patches/series 2020-02-17 17:33:43.000000000 +0000 +++ apr-1.6.5/debian/patches/series 2018-11-19 12:28:03.000000000 +0000 @@ -10,4 +10,3 @@ debug_testpoll_failure.patch use_fcntl_locking.patch cross.patch -python2.patch