Merge remote-tracking branch 'origin/pr/230'

* origin/pr/230:
  debian: conditional python version dependencies
This commit is contained in:
Marek Marczykowski-Górecki 2020-05-27 03:59:46 +02:00
commit 905b745c6e
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 9 additions and 1 deletions

2
debian/control vendored
View File

@ -87,7 +87,7 @@ Description: Qubes core agent
Package: qubes-core-agent-nautilus Package: qubes-core-agent-nautilus
Architecture: any Architecture: any
Depends: Depends:
python-nautilus, ${pythonver:Depends}-nautilus,
qubes-core-qrexec, qubes-core-qrexec,
Replaces: qubes-core-agent (<< 4.0.0-1) Replaces: qubes-core-agent (<< 4.0.0-1)
Breaks: qubes-core-agent (<< 4.0.0-1) Breaks: qubes-core-agent (<< 4.0.0-1)

8
debian/rules vendored
View File

@ -38,3 +38,11 @@ override_dh_systemd_start:
override_dh_install: override_dh_install:
dh_install --fail-missing dh_install --fail-missing
override_dh_gencontrol:
ifneq ($(shell grep -o 'stretch\|buster' /etc/debian_version),)
echo "pythonver:Depends=python" >> debian/qubes-core-agent-nautilus.substvars
else
echo "pythonver:Depends=python3" >> debian/qubes-core-agent-nautilus.substvars
endif
dh_gencontrol