[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6197-g84bb406

[Michael Tautschnig]

The following commit has been merged in the debian/unstable branch:
commit 84bb406dc98cf2cb0dcbac83edf7633a3a7ab50e
Author: Michael Tautschnig <mt at debian.org>
Date:   Mon Apr 19 13:21:38 2010 +0200

    Don't work on freshclam logrotate in two ways
    
    - removed dh_installlogrotate stuff
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 623543c..a0b8d6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,7 @@ clamav (0.96+dfsg-2) unstable; urgency=low
     (closes: #578306)
   
   [ Michael Tautschnig ]
-  * Create and maintain logrotate file (closes: #577041)
+  * Create and maintain freshclam's logrotate file (closes: #577041)
   * Set milter's LogFile debconf option to a non-blank value; LogFile was
     implicitly enabled by default anyway through postinst logic; make LogTime
     default to sync with clamav-daemon (closes: #534748)
@@ -26,7 +26,7 @@ clamav (0.96+dfsg-2) unstable; urgency=low
   * Changed debconf template for freshclam/interface question to make clear
     that multiple interfaces are ok (closes: #545969)
 
- -- Stephen Gran <sgran at debian.org>  Mon, 19 Apr 2010 01:50:50 +0100
+ -- Stephen Gran <sgran at debian.org>  Mon, 19 Apr 2010 13:21:02 +0200
 
 clamav (0.96+dfsg-1) unstable; urgency=low
 
diff --git a/debian/clamav-freshclam.logrotate b/debian/clamav-freshclam.logrotate
deleted file mode 100644
index ffea362..0000000
--- a/debian/clamav-freshclam.logrotate
+++ /dev/null
@@ -1,11 +0,0 @@
-/var/log/clamav/freshclam.log {
-     rotate 12
-     weekly
-     compress
-     delaycompress
-     create 640 clamav adm
-     postrotate
-     /etc/init.d/clamav-freshclam reload-log > /dev/null
-     endscript
-     }
-
diff --git a/debian/rules b/debian/rules
index 5c3a2d2..417f151 100755
--- a/debian/rules
+++ b/debian/rules
@@ -240,7 +240,6 @@ clamav-freshclam: install
 	dh_installinit -p$@ --noscripts
 	dh_installman -p$@
 	dh_link -p$@
-	dh_installlogrotate -p$@
 	${STRIP_OPTS}
 	dh_compress -p$@ -Xexamples/
 	dh_installdebconf -p$@
@@ -267,7 +266,6 @@ clamav-daemon: install
 	dh_installdocs -p$@ 
 	dh_installchangelogs -p$@ ChangeLog 
 	dh_link -p$@
-	dh_installlogrotate -p$@
 	${STRIP_OPTS}
 	dh_compress -p$@
 	dh_md5sums -p$@
@@ -291,7 +289,6 @@ clamav-milter: install
 	dh_installdebconf -p$@
 	dh_installlogcheck -p$@
 	dh_link -p$@
-	dh_installlogrotate -p$@
 	dh_installexamples -p$@
 	dh_compress -p$@ -Xexamples/
 	${STRIP_OPTS}

-- 
Debian repository for ClamAV