[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.9.7_rc2-1-6-ge49612b

[Guido Günther]

The following commit has been merged in the master branch:
commit 0b10e481726369cb2104557c6a0a2d73ee632459
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Nov 10 18:39:25 2011 +0100

    Install logrotate files again.
    
    This got broken by moving to separate build-dir. Based on a patch
    from Serge Hallyn.
    
    Closes: #647953

diff --git a/debian/libvirt-bin.postinst b/debian/libvirt-bin.postinst
index 34e275e..c22dd21 100644
--- a/debian/libvirt-bin.postinst
+++ b/debian/libvirt-bin.postinst
@@ -104,6 +104,12 @@ case "$1" in
 		update-rc.d -f libvirt-bin remove >/dev/null
 	    fi
 	fi
+
+	# Make sure the directories don't get removed on package removal since
+	# logrotate chokes otherwise.
+	for dir in qemu uml lxc; do
+	    touch /var/log/libvirt/"${dir}"/.placeholder
+	done
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/rules b/debian/rules
index 463492f..4c411d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -92,7 +92,7 @@ binary-install/libvirt-bin::
 	dh_installinit --name=libvirt-guests --no-restart-on-upgrade -- defaults 29 71
 
 	for l in $(LOGROTATE); do \
-		cp $(CURDIR)/daemon/$$l.logrotate    \
+		cp $(CURDIR)/debian/build/daemon/$$l.logrotate \
                    debian/libvirt-bin.$$l.logrotate; \
 		dh_installlogrotate --name=$$l;     \
 	done

-- 
Libvirt Debian packaging