From 4ce729ffc627d0bd2355780eea1c747e0698d28f Mon Sep 17 00:00:00 2001 From: lichenggang Date: Tue, 9 Jun 2026 17:11:13 +0800 Subject: [PATCH] fix: resolve file conflict during upgrade from 10.7.0-3deepin3,add missing trailing newline to sw64 CPU patch --- debian/changelog | 28 +++++++++++++++++++ debian/control | 13 +++++++-- .../fix-sw64-cpu-update-signature.patch | 2 +- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 417025d3..84ed45cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,31 @@ +libvirt (10.7.0+really9.10.0-1deepin19) unstable; urgency=medium + + * Fix file conflict between libvirt-clients and libvirt-daemon-common + * Add Breaks/Replaces on libvirt-daemon-common in libvirt-clients + * During upgrade from 10.7.0-3deepin3, libvirt-clients tries to + overwrite /usr/bin/virt-admin which is owned by libvirt-daemon-common + * Add Breaks/Replaces on libvirt-daemon-driver-network in + libvirt-daemon and libvirt-daemon-system + * During upgrade from 10.7.0-3deepin3, libvirt-daemon tries to + overwrite /usr/lib/libvirt/libvirt_leaseshelper and + libvirt_driver_network.so which are owned by + libvirt-daemon-driver-network + * add missing trailing newline to sw64 CPU patch + + -- lichenggang Tue, 14 Apr 2026 10:00:00 +0800 + +libvirt (10.7.0+really9.10.0-1deepin18) unstable; urgency=medium + + * Fix file conflict between libvirt-daemon-system and libvirt-daemon- + common + * Add Breaks/Replaces on libvirt-daemon-common in libvirt-daemon- + system + * During upgrade from 10.7.0-3deepin3, libvirt-daemon-system tries to + overwrite /etc/apparmor.d/usr.lib.libvirt.virt-aa-helper which is + owned by libvirt-daemon-common + + -- lichenggang Thu, 04 Jun 2026 14:18:19 +0800 + libvirt (10.7.0+really9.10.0-1deepin17) unstable; urgency=medium * Fix package file conflict between libvirt-daemon and libvirt-daemon-common diff --git a/debian/control b/debian/control index ed9b8bb5..5e9bef23 100644 --- a/debian/control +++ b/debian/control @@ -79,12 +79,15 @@ Suggests: libvirt-daemon (= ${binary:Version}), libvirt-login-shell (= ${binary:Version}), Breaks: + libvirt-common (<< 10.7.0+really9.10.0-1deepin6), libvirt-daemon (<< 6.9.0-2~), + libvirt-daemon-common, libvirt-daemon-driver-qemu (<< 6.9.0-2~), - libvirt-common (<< 10.7.0+really9.10.0-1deepin6), Replaces: - libvirt-daemon (<< 6.9.0-2~), libvirt-common (<< 10.7.0+really9.10.0-1deepin6), + libvirt-daemon (<< 6.9.0-2~), + libvirt-daemon-common, + libvirt-daemon-driver-qemu (<< 6.9.0-2~), Description: Programs for the libvirt library Libvirt is a C toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes). The library aims at providing @@ -166,10 +169,12 @@ Breaks: libvirt-clients (<< 6.9.0-2~), libvirt-daemon-common, libvirt-daemon-driver-lxc (<< 6.9.0-2~), + libvirt-daemon-driver-network (<< 10.7.0+really9.10.0-1deepin17), libvirt-daemon-system (<< 6.9.0-3~), libvirt-sanlock (<< 6.9.0-2~), Replaces: libvirt-daemon-common, + libvirt-daemon-driver-network (<< 10.7.0+really9.10.0-1deepin17), libvirt-daemon-system (<< 6.9.0-3~), Description: Virtualization daemon Libvirt is a C toolkit to interact with the virtualization capabilities @@ -363,8 +368,12 @@ Suggests: zfsutils, Breaks: libvirt-common (<< 10.7.0+really9.10.0-1deepin6), + libvirt-daemon-common, + libvirt-daemon-driver-network (<< 10.7.0+really9.10.0-1deepin17), Replaces: libvirt-common (<< 10.7.0+really9.10.0-1deepin6), + libvirt-daemon-common, + libvirt-daemon-driver-network (<< 10.7.0+really9.10.0-1deepin17), Description: Libvirt daemon configuration files Libvirt is a C toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes). The library aims at providing diff --git a/debian/patches/fix-sw64-cpu-update-signature.patch b/debian/patches/fix-sw64-cpu-update-signature.patch index d4de4d94..d923754f 100644 --- a/debian/patches/fix-sw64-cpu-update-signature.patch +++ b/debian/patches/fix-sw64-cpu-update-signature.patch @@ -21,4 +21,4 @@ Signed-off-by: lichenggang - virCPUFeaturePolicy removedPolicy G_GNUC_UNUSED) + bool relative ATTRIBUTE_UNUSED) { - g_autoptr(virCPUDef) updated = NULL; \ No newline at end of file + g_autoptr(virCPUDef) updated = NULL;