rpm,deb: add Conflicts: qubes-gui-agent < 4.1.0

This version will not work with qubes-gui-agent not supporting -d
option.

QubesOS/qubes-issues#2619
This commit is contained in:
Marek Marczykowski-Górecki 2019-06-08 05:36:40 +02:00
parent f3b8298081
commit 4cc9ae5a1d
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 7 additions and 1 deletions

6
debian/control vendored
View File

@ -74,7 +74,11 @@ Recommends:
xserver-xorg-core, xserver-xorg-core,
xsettingsd, xsettingsd,
xterm xterm
Conflicts: qubes-core-agent-linux, firewalld, qubes-core-vm-sysvinit Conflicts:
qubes-core-agent-linux,
firewalld,
qubes-core-vm-sysvinit,
qubes-gui-agent (<< 4.1.0-1)
Description: Qubes core agent Description: Qubes core agent
This package includes various daemons necessary for qubes domU support, This package includes various daemons necessary for qubes domU support,
such as qrexec services. such as qrexec services.

View File

@ -148,6 +148,7 @@ Provides: qubes-core-vm = %{version}-%{release}
Obsoletes: qubes-core-vm < 4.0.0 Obsoletes: qubes-core-vm < 4.0.0
Provides: qubes-core-vm-doc = %{version}-%{release} Provides: qubes-core-vm-doc = %{version}-%{release}
Obsoletes: qubes-core-vm-doc < 4.0.0 Obsoletes: qubes-core-vm-doc < 4.0.0
Conflicts: qubes-gui-agent < 4.1.0
BuildRequires: gcc BuildRequires: gcc
BuildRequires: pandoc BuildRequires: pandoc
BuildRequires: xen-devel BuildRequires: xen-devel
@ -809,6 +810,7 @@ Provides: qubes-core-agent-init-scripts
Conflicts: qubes-core-agent-sysvinit Conflicts: qubes-core-agent-sysvinit
Provides: qubes-core-vm-systemd = %{version}-%{release} Provides: qubes-core-vm-systemd = %{version}-%{release}
Obsoletes: qubes-core-vm-systemd < 4.0.0 Obsoletes: qubes-core-vm-systemd < 4.0.0
Conflicts: qubes-gui-agent < 4.1.0
%description systemd %description systemd
The Qubes core startup configuration for SystemD init. The Qubes core startup configuration for SystemD init.