~paelzer/ubuntu/+source/libvirt:merge-focal/6.0-rc2-for-focal

Last commit made on 2020-01-31
Get this branch:
git clone -b merge-focal/6.0-rc2-for-focal https://git.launchpad.net/~paelzer/ubuntu/+source/libvirt
Only Christian Ehrhardt  can upload to this branch. If you are Christian Ehrhardt  please log in for upload directions.

Branch merges

Branch information

Name:
merge-focal/6.0-rc2-for-focal
Repository:
lp:~paelzer/ubuntu/+source/libvirt

Recent commits

8c68d44... by Christian Ehrhardt 

changelog: merge 6.0.0-0ubuntu1

Signed-off-by: Christian Ehrhardt <email address hidden>

cf4ed5f... by Christian Ehrhardt 

d/p/lp-1655111*: fix qemu_bridge_helper to work with named profiles (LP: #1655111)

Signed-off-by: Christian Ehrhardt <email address hidden>

1102d62... by Christian Ehrhardt 

d/rules: install /etc/default/* files that are shared between sysv and systemd packages

Signed-off-by: Christian Ehrhardt <email address hidden>

a82e24a... by Christian Ehrhardt 

d/rules: add libvirt-guests.default to libvirt-daemon-system instead of libvirt-daemon-system-sysv

Signed-off-by: Christian Ehrhardt <email address hidden>

565c186... by Christian Ehrhardt 

d/rules: don't ship split daemons just yet

Signed-off-by: Christian Ehrhardt <email address hidden>

c44e10e... by Christian Ehrhardt 

d/libnss-libvirt.lintian-overrides: accept having two nss so files

Signed-off-by: Christian Ehrhardt <email address hidden>

4b00512... by Christian Ehrhardt 

d/libvirt-daemon-system-sysv.lintian-overrides: not shipping systemd files

Packages are pslit intentionally, ignore this lintian warning.

Signed-off-by: Christian Ehrhardt <email address hidden>

7769986... by Christian Ehrhardt 

d/libvirt-doc.doc-base.libvirt-doc: adapt doc base to new file placement

Signed-off-by: Christian Ehrhardt <email address hidden>

b651c80... by Christian Ehrhardt 

d/libvirt-daemon-system.examples: drop old examples that are now active

I got aware to this by
 dh_installexamples: Cannot find (any matches for) "src/remote/libvirtd.conf" (tried in ., debian/tmp)
as this is now a src/remote/libvirtd.conf.in file

But I realized that the examples got somewhat surpassed by how we deliver
the files anyway. We already have a buch of those files, so instead of
examples the are now proper conffiles and can be dropped from examples.

Check for equal content after clean package install (to prove there is
no gain in providing them twice):

root@f:~# dpkg -L libvirt-doc libvirt-daemon-system | grep libvirtd.conf
/etc/libvirt/libvirtd.conf
/usr/share/doc/libvirt-daemon-system/examples/libvirtd.conf
root@f:~# md5sum /etc/libvirt/libvirtd.conf /usr/share/doc/libvirt-daemon-system/examples/libvirtd.conf
dc105410e7ec53a2d539b2b56f4d195a /etc/libvirt/libvirtd.conf
dc105410e7ec53a2d539b2b56f4d195a /usr/share/doc/libvirt-daemon-system/examples/libvirtd.conf

root@f:~# dpkg -L libvirt-doc libvirt-daemon-system | grep sasl
/etc/sasl2
/etc/sasl2/libvirt.conf
/usr/share/doc/libvirt-daemon-system/examples/libvirtd.sasl
root@f:~# md5sum /etc/sasl2/libvirt.conf /usr/share/doc/libvirt-daemon-system/examples/libvirtd.sasl
09c4fa846e8e27bfa3ab3325900d63ea /etc/sasl2/libvirt.conf
09c4fa846e8e27bfa3ab3325900d63ea /usr/share/doc/libvirt-daemon-system/examples/libvirtd.sasl

Signed-off-by: Christian Ehrhardt <email address hidden>

dc19bc3... by Christian Ehrhardt 

d/rules: drop doc binary cleanup

The new doc build does not trigger the old problem.
Remove the cleanup:
While being still built for example:
./build/examples/c/domain/suspend.o
./build/examples/c/domain/suspend
They are no more ending up in the docs:
$ find libvirt-doc/usr/share/doc/libvirt-doc/examples/ -name "*suspend*"
libvirt-doc/usr/share/doc/libvirt-doc/examples/c/domain/suspend.c

Same for the other file (types) that we cleaned.

Signed-off-by: Christian Ehrhardt <email address hidden>