From 731a87f292c209194ea8bf217caa3125650e80d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 1 Mar 2020 03:11:11 +0100 Subject: [PATCH] Adjust version of required qubes-gui-agent The "qubes-sysinit: set GUI_OPTS in gui-agent-linux" commit breaks gui-agent-linux lacking its counterpart. Express this in the package metadata. QubesOS/qubes-issues#5662 --- debian/control | 2 +- rpm_spec/core-agent.spec.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 9bb224c..0335ce7 100644 --- a/debian/control +++ b/debian/control @@ -79,7 +79,7 @@ Conflicts: qubes-core-agent-linux, firewalld, qubes-core-vm-sysvinit, - qubes-gui-agent (<< 4.1.0-1) + qubes-gui-agent (<< 4.1.6-1) Description: Qubes core agent This package includes various daemons necessary for qubes domU support, such as qrexec services. diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in index d9edd8b..6361dba 100644 --- a/rpm_spec/core-agent.spec.in +++ b/rpm_spec/core-agent.spec.in @@ -145,7 +145,7 @@ Provides: qubes-core-vm = %{version}-%{release} Obsoletes: qubes-core-vm < 4.0.0 Provides: qubes-core-vm-doc = %{version}-%{release} Obsoletes: qubes-core-vm-doc < 4.0.0 -Conflicts: qubes-gui-agent < 4.1.0 +Conflicts: qubes-gui-agent < 4.1.6 BuildRequires: gcc BuildRequires: pandoc BuildRequires: xen-devel