[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.9.3-1-8-g1b0e577

[Guido Günther]

The following commit has been merged in the master branch:
commit 6a57427abbc906b3ffcf9e48bb4821063f20b94d
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sat Jul 23 12:26:41 2011 +0200

    Logrotate logs from HVs other than qemu too
    
    Closes: #625746

diff --git a/debian/libvirt-bin.libvirtd.logrotate b/debian/libvirt-bin.libvirtd.logrotate
deleted file mode 100644
index a4d32a0..0000000
--- a/debian/libvirt-bin.libvirtd.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/libvirt/qemu/*.log {
-        daily
-        missingok
-        rotate 7
-        compress
-        delaycompress
-        notifempty
-        copytruncate
-}
diff --git a/debian/rules b/debian/rules
index bdfc612..26fbb10 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,8 +77,8 @@ DEB_COMPRESS_EXCLUDE = .o event-test hellolibvirt info1 suspend
 DEB_PYTHON_SETUP_CMD = /dev/null
 DEB_DH_MAKESHLIBS_ARGS_libvirt0 += -V 'libvirt0 (>= 0.5.0)'
 DEB_DH_INSTALLINIT_ARGS = --no-restart-on-upgrade -- defaults 28 72
-DEB_DH_INSTALLLOGROTATE_ARGS = --name=libvirtd
 
+LOGROTATE = $(basename $(basename $(notdir $(wildcard daemon/libvirtd*.logrotate.in))))
 EXAMPLES_DIR = $(CURDIR)/debian/libvirt-doc/usr/share/doc/libvirt-doc/examples/
 
 binary-install/libvirt-bin::
@@ -86,10 +86,17 @@ binary-install/libvirt-bin::
 	cp $(CURDIR)/tools/libvirt-guests.sysconf $(CURDIR)/debian/libvirt-bin.libvirt-guests.default
 	dh_installinit --name=libvirt-guests --no-restart-on-upgrade -- defaults 29 71
 
+	for l in $(LOGROTATE); do \
+		cp $(CURDIR)/daemon/$$l.logrotate    \
+                   debian/libvirt-bin.$$l.logrotate; \
+		dh_installlogrotate --name=$$l;     \
+	done
+
 build/libvirt-bin::
 	# Add empty dir so dh_install doesn't fail on kFreebsd until we have Polkit support
 	mkdir -p debian/tmp/usr/share/polkit-1
 
+
 binary-install/libvirt-doc::
 	find $(EXAMPLES_DIR) -name "*.o" -type f -delete -o -name .libs -type d -exec rm -rf {} \;
 	rm -f $(EXAMPLES_DIR)domain-events/events-c/event-test
@@ -100,3 +107,4 @@ binary-install/libvirt-doc::
 clean::
 	rm -f $(CURDIR)/debian/libvirt-bin.libvirt-guests.init
 	rm -f $(CURDIR)/debian/libvirt-bin.libvirt-guests.default
+	rm -f $(CURDIR)/debian/libvirt-bin.*.logrotate

-- 
Libvirt Debian packaging