debian packaging: compatibly fix python deps for focal

This commit is contained in:
Jean-Francois Dockes 2020-03-14 08:16:46 +01:00
parent f141e35279
commit d2b695d705
2 changed files with 6 additions and 6 deletions

View File

@ -6,10 +6,10 @@
PPA_KEYID=D38B9201 PPA_KEYID=D38B9201
RCLVERS=1.26.4 RCLVERS=1.26.5
SCOPEVERS=1.20.2.4 SCOPEVERS=1.20.2.4
GSSPVERS=1.0.0 GSSPVERS=1.0.0
PPAVERS=1 PPAVERS=2
# #
RCLSRC=/y/home/dockes/projets/fulltext/recoll/src RCLSRC=/y/home/dockes/projets/fulltext/recoll/src
@ -55,7 +55,7 @@ debdir=debian
# 19.10 eoan 2020-07 # 19.10 eoan 2020-07
# 20.04LTS focal 2025-04 # 20.04LTS focal 2025-04
series="xenial bionic disco eoan focal" series="xenial bionic disco eoan focal"
series= #series=
if test "X$series" != X ; then if test "X$series" != X ; then
check_recoll_orig check_recoll_orig
@ -101,7 +101,7 @@ done
# 19.10 eoan 2020-07 # 19.10 eoan 2020-07
# 20.04LTS focal 2025-04 # 20.04LTS focal 2025-04
series="xenial bionic disco eoan focal" series="xenial bionic disco eoan focal"
#series= series=
debdir=debiankio debdir=debiankio
topdir=kio-recoll-${RCLVERS} topdir=kio-recoll-${RCLVERS}

View File

@ -54,7 +54,7 @@ Package: recollcmd
Architecture: any Architecture: any
Breaks: recoll (<< 1.23.7-2) Breaks: recoll (<< 1.23.7-2)
Replaces: 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, Recommends: antiword,
aspell, aspell,
groff, groff,
@ -87,7 +87,7 @@ Description: GUI program and elements for recoll
Package: python-recoll Package: python-recoll
Architecture: any Architecture: any
Section: python Section: python
Depends: python, Depends: python2,
recollcmd (= ${binary:Version}), recollcmd (= ${binary:Version}),
${misc:Depends}, ${misc:Depends},
${python:Depends}, ${python:Depends},