From b861a44f39521be6c5c81f0d7aa39bdedae6be82 Mon Sep 17 00:00:00 2001 From: Magnus Jacobsson Date: Sun, 12 Apr 2020 16:39:03 +0200 Subject: [PATCH] Use any python version for python bindings In order to work on Ubuntu 20.04 which does not have a "python" lib, only "python3" and "python2". See https://www.fosslinux.com/26413/ubuntu-20-04-lts-focal-fossa-set-to-remove-python-2.htm. Also needed was to replace pyversion which found only Python 2 versions. Possibly this can done in a better way by someone who understands Debian packaging in general and Lintian in particular. See https://lintian.debian.org/tags/debian-pyversions-is-obsolete.html. --- debian/libgv-python.install | 2 +- debian/rules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/libgv-python.install b/debian/libgv-python.install index 2b952cf14..a4491b836 100644 --- a/debian/libgv-python.install +++ b/debian/libgv-python.install @@ -1,4 +1,4 @@ -usr/lib/graphviz/python +usr/lib/graphviz/python* #usr/lib/graphviz/python24 #usr/lib/graphviz/python25 #usr/lib/graphviz/python26 diff --git a/debian/rules b/debian/rules index 2a7b5b2c7..e7e4630b9 100755 --- a/debian/rules +++ b/debian/rules @@ -33,7 +33,7 @@ LUA_PACKAGE = $(CURDIR)/debian/libgv-lua DEV_PACKAGE = $(CURDIR)/debian/libgraphviz-dev -PYTHON_VERSIONS = $(shell pyversions -s) +PYTHON_VERSIONS = $(shell python2 --version |& sed 's/.* \(.*\)\..*/\1/'; python3 --version |& sed 's/.* \(.*\)\..*/\1/') PYTHON_PACKAGE = $(CURDIR)/debian/libgv-python RUBY_VERSION = 1.8 -- 2.40.0