From d0bc4a0b75d83f133df7117db2056e2e1298935f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Fri, 7 Feb 2020 04:40:41 +0100
Subject: [PATCH] rpm, deb: declare conflict with qubes-core-agent shipping
 qvm-console

The file was moved to this package, avoid it being installed by both
packages.
---
 debian/control                           | 1 +
 rpm_spec/qubes-core-admin-client.spec.in | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/control b/debian/control
index 6d9c537..cd2a0d7 100644
--- a/debian/control
+++ b/debian/control
@@ -26,6 +26,7 @@ Depends:
  ${python:Depends},
  ${python3:Depends},
  ${misc:Depends}
+Conflicts: qubes-core-agent (<< 4.1.9)
 Description: Qubes administrative tools
  Tools to manage Qubes system using Admin API
 
diff --git a/rpm_spec/qubes-core-admin-client.spec.in b/rpm_spec/qubes-core-admin-client.spec.in
index 8aef2b7..2d7aa45 100644
--- a/rpm_spec/qubes-core-admin-client.spec.in
+++ b/rpm_spec/qubes-core-admin-client.spec.in
@@ -15,6 +15,7 @@ Requires:   python%{python3_pkgversion}-qubesadmin
 Requires:   python%{python3_pkgversion}-yaml
 BuildArch:  noarch
 Source0: %{name}-%{version}.tar.gz
+Conflicts:  qubes-core-agent < 4.1.9
 
 %description
 This package include managemt tools, like qvm-*.