Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adjust dependencies for clean upgrade

Browse Source 
When a file is moved to other package, the new package needs Replaces:
and Breaks: dependecies on old package. Otherwise dpkg will refuse to
change file ownership.

QubesOS/qubes-issues#2771
This commit is contained in:
Marek Marczykowski-Górecki 2017-05-30 12:22:09 +02:00
parent c8e2c69145
commit db066888e1
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
debian/control vendored
View File

@ -77,10 +77,12 @@ Description: Qubes core agent
Package: qubes-core-agent-nautilus Package: qubes-core-agent-nautilus
Architecture: any Architecture: any
Description: Qubes integration for Nautilus
Nautilus addons for inter-VM file copy/move/open.
Depends: Depends:
python-nautilus, python-nautilus,
Replaces: qubes-core-agent (<< 4.0.0-1)
Breaks: qubes-core-agent (<< 4.0.0-1)
Description: Qubes integration for Nautilus
Nautilus addons for inter-VM file copy/move/open.
Package: qubes-core-agent-dom0-updates Package: qubes-core-agent-dom0-updates
Architecture: any Architecture: any
@ -88,6 +90,8 @@ Depends:
fakeroot, fakeroot,
yum, yum,
yum-utils yum-utils
Replaces: qubes-core-agent (<< 4.0.0-1)
Breaks: qubes-core-agent (<< 4.0.0-1)
Description: Scripts required to handle dom0 updates. Description: Scripts required to handle dom0 updates.
Scripts required to handle dom0 updates. This will allow to use the VM as Scripts required to handle dom0 updates. This will allow to use the VM as
"Updates VM". "Updates VM".
@ -106,6 +110,8 @@ Depends:
${misc:Depends} ${misc:Depends}
Recommends: Recommends:
nftables, nftables,
Replaces: qubes-core-agent (<< 4.0.0-1)
Breaks: qubes-core-agent (<< 4.0.0-1)
Description: Networking support for Qubes VM Description: Networking support for Qubes VM
This package provides: This package provides:
* basic network functionality (setting IP address, DNS, default gateway) * basic network functionality (setting IP address, DNS, default gateway)
@ -122,6 +128,8 @@ Depends:
dconf, dconf,
network-manager (>= 0.8.1-1), network-manager (>= 0.8.1-1),
network-manager-gnome, network-manager-gnome,
Replaces: qubes-core-agent (<< 4.0.0-1)
Breaks: qubes-core-agent (<< 4.0.0-1)
Description: NetworkManager integration for Qubes VM Description: NetworkManager integration for Qubes VM
Integration of NetworkManager for Qubes VM: Integration of NetworkManager for Qubes VM:
* make connections config persistent * make connections config persistent

4
rpm_spec/core-agent.spec
View File

@ -185,6 +185,7 @@ DNF plugin for Qubes specific post-installation actions:
Summary: Qubes integration for Nautilus Summary: Qubes integration for Nautilus
Requires: qubes-core-agent Requires: qubes-core-agent
Requires: nautilus-python Requires: nautilus-python
Conflicts: qubes-core-vm < 4.0.0
%description nautilus %description nautilus
Nautilus addons for inter-VM file copy/move/open. Nautilus addons for inter-VM file copy/move/open.
@ -193,6 +194,7 @@ Nautilus addons for inter-VM file copy/move/open.
Summary: Scripts required to handle dom0 updates Summary: Scripts required to handle dom0 updates
Requires: qubes-core-agent Requires: qubes-core-agent
Requires: fakeroot Requires: fakeroot
Conflicts: qubes-core-vm < 4.0.0
%description dom0-updates %description dom0-updates
Scripts required to handle dom0 updates. Scripts required to handle dom0 updates.
@ -205,6 +207,7 @@ Requires: nftables
Requires: nmap-ncat Requires: nmap-ncat
Requires: qubes-core-agent Requires: qubes-core-agent
Requires: tinyproxy Requires: tinyproxy
Conflicts: qubes-core-vm < 4.0.0
%description networking %description networking
This package provides: This package provides:
@ -221,6 +224,7 @@ Summary: NetworkManager integration for Qubes VM
Requires: NetworkManager >= 0.8.1-1 Requires: NetworkManager >= 0.8.1-1
Requires: dconf Requires: dconf
Requires: qubes-core-agent-networking Requires: qubes-core-agent-networking
Conflicts: qubes-core-vm < 4.0.0
%description network-manager %description network-manager
Integration of NetworkManager for Qubes VM: Integration of NetworkManager for Qubes VM: