[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/master] 2 commits: control: Always use versioned deps for libvirt components

[Guido Günther]

Guido Günther pushed to branch debian/master at Libvirt Packaging Team / libvirt


Commits:
8048eefb by Andrea Bolognani at 2021-01-31T16:27:49+01:00
control: Always use versioned deps for libvirt components

libvirt packaging is fairly modularized because we want users
to be able to tailor the installation to their needs by deciding
which components to include and which ones to leave out, but
mixing and matching different versions is very much not intended
to work.

Right now we're not always enforcing this tight coupling, and
that can result in failures at runtime, especially during
upgrades. Let's address the problem by making sure all
dependencies between libvirt components are versioned.

Closes: #981435

- - - - -
effe0cd5 by Andrea Bolognani at 2021-01-31T18:12:15+01:00
control: Always explicitly depend on libvirt0

dpkg-shlibdeps will figure out these dependencies exist and
include them in ${shlib:Depends}, but they will look like

  Depends: libvirt0 (>= 7.0.0)

which can sometimes end up not being strict enough.

In order to ensure that all parts of libvirt that are tightly
coupled are always upgraded at the same time, make these
dependencies explicit.

- - - - -


1 changed file:

- debian/control


Changes:

=====================================
debian/control
=====================================
@@ -82,9 +82,9 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
- libvirt-login-shell,
+ libvirt-login-shell (= ${binary:Version}),
 Suggests:
- libvirt-daemon,
+ libvirt-daemon (= ${binary:Version}),
 Breaks:
  libvirt-daemon (<< 6.9.0-2~),
  libvirt-daemon-driver-qemu (<< 6.9.0-2~),
@@ -103,7 +103,7 @@ Section: admin
 Architecture: alpha amd64 arm64 armel armhf hppa i386 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64 x32
 Depends:
  libvirt-clients (= ${binary:Version}),
- libvirt-daemon-driver-lxc,
+ libvirt-daemon-driver-lxc (= ${binary:Version}),
  libvirt0 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
@@ -124,23 +124,23 @@ Package: libvirt-daemon
 Section: admin
 Architecture: any
 Depends:
- libvirt-daemon-driver-qemu,
+ libvirt-daemon-driver-qemu (= ${binary:Version}),
  libvirt0 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
- libvirt-daemon-driver-lxc,
- libvirt-daemon-driver-vbox,
- libvirt-daemon-driver-xen,
+ libvirt-daemon-driver-lxc (= ${binary:Version}),
+ libvirt-daemon-driver-vbox (= ${binary:Version}),
+ libvirt-daemon-driver-xen (= ${binary:Version}),
  libxml2-utils,
  netcat-openbsd,
  qemu-kvm | qemu-system (>= 0.9.1),
 Suggests:
- libvirt-daemon-driver-storage-gluster,
- libvirt-daemon-driver-storage-iscsi-direct,
- libvirt-daemon-driver-storage-rbd,
- libvirt-daemon-driver-storage-zfs,
- libvirt-daemon-system,
+ libvirt-daemon-driver-storage-gluster (= ${binary:Version}),
+ libvirt-daemon-driver-storage-iscsi-direct (= ${binary:Version}),
+ libvirt-daemon-driver-storage-rbd (= ${binary:Version}),
+ libvirt-daemon-driver-storage-zfs (= ${binary:Version}),
+ libvirt-daemon-system (= ${binary:Version}),
  numad,
 Enhances:
  qemu-kvm,
@@ -165,6 +165,7 @@ Package: libvirt-daemon-driver-qemu
 Section: admin
 Architecture: linux-any
 Depends:
+ libvirt0 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Breaks:
@@ -186,6 +187,7 @@ Section: admin
 Architecture: alpha amd64 arm64 armel armhf hppa i386 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64 x32
 Depends:
  libvirt-daemon (= ${binary:Version}),
+ libvirt0 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Breaks:
@@ -205,6 +207,7 @@ Section: admin
 Architecture: amd64 i386
 Depends:
  libvirt-daemon (= ${binary:Version}),
+ libvirt0 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Breaks:
@@ -224,6 +227,7 @@ Section: admin
 Architecture: amd64 arm64 armhf i386
 Depends:
  libvirt-daemon (= ${binary:Version}),
+ libvirt0 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Breaks:
@@ -243,6 +247,7 @@ Section: admin
 Architecture: linux-any
 Depends:
  libvirt-daemon (= ${binary:Version}),
+ libvirt0 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Breaks:
@@ -262,6 +267,7 @@ Section: admin
 Architecture: linux-any
 Depends:
  libvirt-daemon (= ${binary:Version}),
+ libvirt0 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
@@ -280,6 +286,7 @@ Section: admin
 Architecture: linux-any
 Depends:
  libvirt-daemon (= ${binary:Version}),
+ libvirt0 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Breaks:
@@ -299,6 +306,7 @@ Section: admin
 Architecture: linux-any
 Depends:
  libvirt-daemon (= ${binary:Version}),
+ libvirt0 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Breaks:
@@ -324,9 +332,9 @@ Depends:
  iptables (>= 1.8.1-1) [linux-any] | firewalld,
  libvirt-clients (= ${binary:Version}),
  libvirt-daemon (= ${binary:Version}),
- libvirt-daemon-config-network,
- libvirt-daemon-config-nwfilter,
- libvirt-daemon-system-systemd | libvirt-daemon-system-sysv,
+ libvirt-daemon-config-network (= ${source:Version}),
+ libvirt-daemon-config-nwfilter (= ${source:Version}),
+ libvirt-daemon-system-systemd (= ${source:Version}) | libvirt-daemon-system-sysv (= ${source:Version}),
  logrotate,
  policykit-1 [linux-any],
  ${misc:Depends},



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/7391555418fdc3e832db62f37dd299f07b6b3a53...effe0cd509e462ab5ad9de29a4597722e3e85dbc

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/7391555418fdc3e832db62f37dd299f07b6b3a53...effe0cd509e462ab5ad9de29a4597722e3e85dbc
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20210201/86343dab/attachment-0001.html>