From 8c36ea98534d9f5c249ad1d2154442080ac090a3 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Wed, 26 Feb 2020 17:31:33 +0100 Subject: [PATCH] fix debian rules and control for compat with newer systems with beginning python2 obsol. --- packaging/debian/debian/control | 2 +- packaging/debian/debian/rules | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/debian/debian/control b/packaging/debian/debian/control index 4053fde3..b10675bd 100644 --- a/packaging/debian/debian/control +++ b/packaging/debian/debian/control @@ -14,7 +14,7 @@ Build-Depends: bison, libxslt1-dev, libz-dev, pkg-config, - python-dev (>= 2.6.6-3~), + python-all-dev (>= 2.6.6-3~), python-setuptools, python3-all-dev, python3-setuptools, diff --git a/packaging/debian/debian/rules b/packaging/debian/debian/rules index bcea1333..a4aee088 100755 --- a/packaging/debian/debian/rules +++ b/packaging/debian/debian/rules @@ -30,7 +30,7 @@ build3vers := $(shell py3versions -sv) override_dh_auto_install: dh_auto_install - (cd python/recoll; libdir=/usr/lib/$${DEB_BUILD_MULTIARCH} python \ + (cd python/recoll; libdir=/usr/lib/$${DEB_BUILD_MULTIARCH} python2 \ ./setup.py install \ --install-layout=deb \ --prefix=/usr \ @@ -42,7 +42,7 @@ override_dh_auto_install: --prefix=/usr \ --root=$(CURDIR)/debian/tmp/ ) ; \ done - (cd python/pychm; python ./setup.py install \ + (cd python/pychm; python2 ./setup.py install \ --install-layout=deb \ --prefix=/usr \ --root=$(CURDIR)/debian/tmp/ )