Skip to content

Resolve file conflict #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
UTsweetyfish wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Resolve file conflict #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
libvirt (10.7.0+really9.10.0-1deepin7) unstable; urgency=medium

* Resolve file conflict

-- Tianyu Chen <sweetyfish@deepin.org> Thu, 07 May 2026 18:18:26 +0800

libvirt (10.7.0+really9.10.0-1deepin6) unstable; urgency=medium

* Revert to previous upstream.
Expand Down
10 changes: 10 additions & 0 deletions debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,10 @@ Suggests:
Breaks:
libvirt-daemon (<< 6.9.0-2~),
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),
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
Expand Down Expand Up @@ -357,6 +359,10 @@ Suggests:
systemd,
systemtap,
zfsutils,
Breaks:
libvirt-common (<< 10.7.0+really9.10.0-1deepin6),
Replaces:
libvirt-common (<< 10.7.0+really9.10.0-1deepin6),
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
Expand Down Expand Up @@ -453,6 +459,10 @@ Depends:
${shlibs:Depends},
Recommends:
libvirt-l10n (= ${binary:Version}),
Breaks:
libvirt-common (<< 10.7.0+really9.10.0-1deepin6),
Replaces:
libvirt-common (<< 10.7.0+really9.10.0-1deepin6),
Description: library for interfacing with different virtualization systems
Libvirt is a C toolkit to interact with the virtualization capabilities
of recent versions of Linux (and other OSes). The library aims at providing
Expand Down
Loading