소스 검색

Adjust dependencies for clean upgrade

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
Marek Marczykowski-Górecki 7 년 전
부모
커밋
db066888e1
2개의 변경된 파일14개의 추가작업 그리고 2개의 파일을 삭제
  1. 10 2
      debian/control
  2. 4 0
      rpm_spec/core-agent.spec

+ 10 - 2
debian/control

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

+ 4 - 0
rpm_spec/core-agent.spec

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