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

Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>

debian/libvirt-daemon.install

-usr/sbin/*
+usr/sbin/libvirtd
+usr/sbin/virt-sanlock-cleanup
+usr/sbin/virtlockd
+usr/sbin/virtlogd
 usr/lib/libvirt/libvirt_*
 usr/lib/libvirt/libvirt-guests.sh
 usr/lib/*/libvirt/lock-driver/lockd.so
@@ -8,7 +11,12 @@ usr/lib/*/libvirt/connection-driver/libvirt_driver_nodedev.so
 usr/lib/*/libvirt/connection-driver/libvirt_driver_nwfilter.so
 usr/lib/*/libvirt/connection-driver/libvirt_driver_secret.so
 usr/lib/*/libvirt/connection-driver/libvirt_driver_storage.so
-usr/share/augeas/*
+usr/share/augeas/lenses/libvirtd.aug
+usr/share/augeas/lenses/virtlockd.aug
+usr/share/augeas/lenses/virtlogd.aug
+usr/share/augeas/lenses/tests/test_libvirtd.aug
+usr/share/augeas/lenses/tests/test_virtlockd.aug
+usr/share/augeas/lenses/tests/test_virtlogd.aug
 usr/share/bash-completion/*
 usr/share/man/man8/*
 usr/lib/*/libvirt/storage-backend/libvirt_storage_backend_disk.so

debian/rules

@@ -150,6 +150,9 @@ LIBVIRT_SYSTEM_SERVICES = \
 
 DEB_BUILDDIR := $(CURDIR)/debian/build
 LOGROTATE = $(basename $(basename $(notdir $(wildcard src/remote/libvirtd*.logrotate.in))))
+SRV_MONOLITHIC = libvirt-guests virtlogd virtlockd libvirtd libvirtd-tcp libvirtd-tls virt-guest-shutdown
+# For split daemons later, as of 6.0 the remaining elments are
+#SRV_SPLIT = virtnwfilterd virtinterfaced virtlxcd virtnetworkd virtnodedevd virtproxyd virtqemud virtsecretd virtstoraged virtvboxd virtxend virtproxyd-tcp virtproxyd-tls
 
 %:
 	dh $@ --builddirectory=$(DEB_BUILDDIR)
@@ -187,7 +190,10 @@ override_dh_install-arch:
 	    debian/libvirt-daemon-system/var/lib/polkit-1/localauthority/10-vendor.d/
 ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
 	# Linux supports more nice things:
-	dh_install -p libvirt-daemon-system usr/lib/systemd/system lib/systemd/
+	set -e; for f in $(SRV_MONOLITHIC); do \
+		dh_install -p libvirt-daemon-system  usr/lib/systemd/system/$${f}* \
+			lib/systemd/system/; \
+	done
 	dh_install -p libvirt-daemon-system usr/lib/libvirt/virt-aa-helper
 	dh_install -p libvirt-daemon-system etc/apparmor.d
 	dh_apparmor -p libvirt-daemon-system --profile-name=usr.lib.libvirt.virt-aa-helper