From 67f8e9e9851b3356f2f08cf0c7a666523c2081b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sat, 10 Jun 2017 23:15:22 +0200 Subject: [PATCH] rpm,deb: fix dependencies 1. Cannot Recommend: nftables, as Debian jessie doesn't have it. 2. gsettings tool is in glib, not dconf --- debian/control | 4 ++-- rpm_spec/core-agent.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 759ccde..d046850 100644 --- a/debian/control +++ b/debian/control @@ -120,7 +120,7 @@ Depends: tinyproxy, ${python:Depends}, ${misc:Depends} -Recommends: +Suggests: nftables, Replaces: qubes-core-agent (<< 4.0.0-1) Breaks: qubes-core-agent (<< 4.0.0-1) @@ -137,7 +137,7 @@ Package: qubes-core-agent-network-manager Architecture: any Depends: qubes-core-agent-networking, - dconf, + libglib2.0-bin, network-manager (>= 0.8.1-1), network-manager-gnome, Replaces: qubes-core-agent (<< 4.0.0-1) diff --git a/rpm_spec/core-agent.spec b/rpm_spec/core-agent.spec index 2642f66..d52e8b8 100644 --- a/rpm_spec/core-agent.spec +++ b/rpm_spec/core-agent.spec @@ -232,7 +232,7 @@ qubes-core-agent-network-manager. Summary: NetworkManager integration for Qubes VM # to show/hide nm-applet Requires: NetworkManager >= 0.8.1-1 -Requires: dconf +Requires: glib2 Requires: qubes-core-agent-networking Conflicts: qubes-core-vm < 4.0.0