[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/1.0.6-1-3-g5978fc0

[Guido Günther]

The following commit has been merged in the master branch:
commit 5978fc0708c805bc598aef0de5928fbc93c89977
Author: Michael Stapelberg <michael at stapelberg.de>
Date:   Wed Jun 26 19:47:34 2013 +0200

    switch to dh-systemd for proper systemd maintscripts
    
    Closes: #714197

diff --git a/debian/control b/debian/control
index fb43596..2f5ed38 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian Libvirt Maintainers <pkg-libvirt-maintainers at lists.alioth.deb
 Uploaders: Guido Günther <agx at sigxcpu.org>, Laurent Léonard <laurent at open-minds.org>
 Build-Depends: cdbs (>= 0.4.90~),
  debhelper (>= 7),
+ dh-systemd (>= 1.3),
  libxml2-dev,
  libncurses5-dev,
  libreadline-dev,
diff --git a/debian/libvirt-bin.postinst b/debian/libvirt-bin.postinst
index 3ad45c9..3c21454 100644
--- a/debian/libvirt-bin.postinst
+++ b/debian/libvirt-bin.postinst
@@ -104,12 +104,6 @@ case "$1" in
 	    sleep 1
 	fi
 
-	# enable libvirt-{bin,guests} for systemd
-	if [ -x /bin/systemctl ] && [ -d /sys/fs/cgroup/systemd ]; then
-            systemctl enable libvirt-bin.service
-            systemctl enable libvirt-guests.service
-	fi
-
 	if dpkg --compare-versions "$2" lt "0.6.1-2"; then
 	    if [ -e /etc/rc2.d/S20libvirt-bin ] && \
 	       [ -e /etc/rc3.d/S20libvirt-bin ] && \
diff --git a/debian/rules b/debian/rules
index c1fa1f1..984ce5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -116,9 +116,11 @@ binary-install/libvirt-bin::
 	    debian/libvirt-bin.libvirt-guests.init
 	cp tools/libvirt-guests.sysconf \
 	    debian/libvirt-bin.libvirt-guests.default
+	dh_systemd_enable
 	dh_installinit --name=libvirt-guests --no-restart-on-upgrade -- defaults 29 71
 	-mv debian/libvirt-bin/lib/systemd/system/libvirtd.service \
 	    debian/libvirt-bin/lib/systemd/system/libvirt-bin.service
+	dh_systemd_start
 	rm debian/libvirt-bin/usr/lib/libvirt/connection-driver/*.la
 
 	for l in $(LOGROTATE); do \

-- 
Libvirt Debian packaging