From d2b695d7057349874f4090831b838fd42c7056fc Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Sat, 14 Mar 2020 08:16:46 +0100 Subject: [PATCH] debian packaging: compatibly fix python deps for focal --- packaging/debian/buildppa.sh | 8 ++++---- packaging/debian/debian/control | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packaging/debian/buildppa.sh b/packaging/debian/buildppa.sh index 9fb5835f..f478d7be 100644 --- a/packaging/debian/buildppa.sh +++ b/packaging/debian/buildppa.sh @@ -6,10 +6,10 @@ PPA_KEYID=D38B9201 -RCLVERS=1.26.4 +RCLVERS=1.26.5 SCOPEVERS=1.20.2.4 GSSPVERS=1.0.0 -PPAVERS=1 +PPAVERS=2 # RCLSRC=/y/home/dockes/projets/fulltext/recoll/src @@ -55,7 +55,7 @@ debdir=debian # 19.10 eoan 2020-07 # 20.04LTS focal 2025-04 series="xenial bionic disco eoan focal" -series= +#series= if test "X$series" != X ; then check_recoll_orig @@ -101,7 +101,7 @@ done # 19.10 eoan 2020-07 # 20.04LTS focal 2025-04 series="xenial bionic disco eoan focal" -#series= +series= debdir=debiankio topdir=kio-recoll-${RCLVERS} diff --git a/packaging/debian/debian/control b/packaging/debian/debian/control index b10675bd..fca99f52 100644 --- a/packaging/debian/debian/control +++ b/packaging/debian/debian/control @@ -54,7 +54,7 @@ Package: recollcmd Architecture: any Breaks: recoll (<< 1.23.7-2) Replaces: recoll (<< 1.23.7-2) -Depends: python, python3, ${misc:Depends}, ${shlibs:Depends} +Depends: python3, ${misc:Depends}, ${shlibs:Depends} Recommends: antiword, aspell, groff, @@ -87,7 +87,7 @@ Description: GUI program and elements for recoll Package: python-recoll Architecture: any Section: python -Depends: python, +Depends: python2, recollcmd (= ${binary:Version}), ${misc:Depends}, ${python:Depends},