Source: libvirt Version: 10.0.0-2 Severity: normal Tags: patch User: [email protected] Usertags: dep17m2
We want to finalize the /usr-merge via DEP17 by moving all files to /usr. libvirt installs files into /lib; these should be moved into the respective canonical locations in /usr/. Please find a patch attached. It has been build-tested. This should not be backported to bookworm. If you intend to backport, please use dh_movetousr instead. If your package will change for the t64 transition or otherwise rename/split/move its binaries (packages) during trixie, please then upload to experimental and get in touch with the UsrMerge driver, please see the wiki [1]. Michael [1] https://wiki.debian.org/UsrMerge
diff -Nru libvirt-10.0.0/debian/changelog libvirt-10.0.0/debian/changelog --- libvirt-10.0.0/debian/changelog 2024-02-04 10:54:58.000000000 +0100 +++ libvirt-10.0.0/debian/changelog 2024-02-17 13:54:36.000000000 +0100 @@ -1,3 +1,10 @@ +libvirt (10.0.0-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install NSS modules into /usr. (Closes: #-1) + + -- Michael Biebl <[email protected]> Sat, 17 Feb 2024 13:54:36 +0100 + libvirt (10.0.0-2) unstable; urgency=medium * [9a4ad47] patches: Add backport/scripts-Make-check-symfile[...] diff -Nru libvirt-10.0.0/debian/libnss-libvirt.install libvirt-10.0.0/debian/libnss-libvirt.install --- libvirt-10.0.0/debian/libnss-libvirt.install 2024-02-04 10:54:58.000000000 +0100 +++ libvirt-10.0.0/debian/libnss-libvirt.install 2024-02-17 13:54:36.000000000 +0100 @@ -1,2 +1,4 @@ # the nss module (once enabled) will make apt call getdents (LP: #1732030) debian/apt/90libnss-libvirt etc/apt/apt.conf.d +usr/lib/${DEB_HOST_MULTIARCH}/libnss_libvirt.so.2 +usr/lib/${DEB_HOST_MULTIARCH}/libnss_libvirt_guest.so.2 diff -Nru libvirt-10.0.0/debian/rules libvirt-10.0.0/debian/rules --- libvirt-10.0.0/debian/rules 2024-02-04 10:54:58.000000000 +0100 +++ libvirt-10.0.0/debian/rules 2024-02-17 13:53:46.000000000 +0100 @@ -249,11 +249,6 @@ usr.sbin.libvirtd \ $(NULL) -NSS_PLUGINS = \ - libvirt \ - libvirt_guest \ - $(NULL) - SYSTEMTAP_TAPSETS = \ libvirt_functions \ libvirt_probes \ @@ -354,11 +349,6 @@ usr/share/systemtap/tapset/$${f}.stp; \ done; \ fi - set -e; for f in $(NSS_PLUGINS); do \ - dh_install -p libnss-libvirt \ - usr/lib/$(DEB_HOST_MULTIARCH)/libnss_$${f}.so.2 \ - lib/$(DEB_HOST_MULTIARCH)/; \ - done dh_install -p libvirt-clients usr/bin/virt-host-validate dh_install -p libvirt-clients usr/share/man/man1/virt-host-validate.1 endif
