[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 99ae9353f6834da0cb73f59f4b32d1f0ae1263fa

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit 6f88015d69d859d7a7cdc845f0debfc00a9309ba
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:18 2008 +0100

    Revert "Add reportbug script to get configuration information on new reports"
    
    This reverts commit 041a6244f60eb8e7081bc2913ba53347952da019.

diff --git a/debian/clamav-base.dirs b/debian/clamav-base.dirs
index 4f2be81..91bec53 100644
--- a/debian/clamav-base.dirs
+++ b/debian/clamav-base.dirs
@@ -1,7 +1,6 @@
 etc/
 etc/clamav/
 usr/share/lintian/overrides/
-usr/share/bug/clamav-base
 var/
 var/lib/
 var/lib/clamav/
diff --git a/debian/clamav-base.install b/debian/clamav-base.install
deleted file mode 100644
index 843841a..0000000
--- a/debian/clamav-base.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/script usr/share/bug/clamav-base/
diff --git a/debian/clamav-daemon.dirs b/debian/clamav-daemon.dirs
index b3a7ebf..602f018 100644
--- a/debian/clamav-daemon.dirs
+++ b/debian/clamav-daemon.dirs
@@ -3,4 +3,3 @@ etc/clamav
 etc/clamav/virusevent.d
 usr/sbin/
 usr/share/lintian/overrides/
-usr/share/bug/clamav-daemon
diff --git a/debian/clamav-daemon.install b/debian/clamav-daemon.install
index c71366a..4c5ed13 100644
--- a/debian/clamav-daemon.install
+++ b/debian/clamav-daemon.install
@@ -1,4 +1,3 @@
 debian/tmp/usr/sbin/clamd
 debian/tmp/usr/bin/clamdscan
 debian/tmp/usr/bin/clamconf
-debian/script usr/share/bug/clamav-daemon/
diff --git a/debian/clamav-freshclam.dirs b/debian/clamav-freshclam.dirs
index f07eb63..7260b5d 100644
--- a/debian/clamav-freshclam.dirs
+++ b/debian/clamav-freshclam.dirs
@@ -4,4 +4,3 @@ etc/clamav
 etc/clamav/onupdateexecute.d
 etc/clamav/onerrorexecute.d
 usr/share/lintian/overrides
-usr/share/bug/clamav-freshclam
diff --git a/debian/clamav-freshclam.install b/debian/clamav-freshclam.install
index 163c289..a9b0904 100644
--- a/debian/clamav-freshclam.install
+++ b/debian/clamav-freshclam.install
@@ -3,4 +3,3 @@ debian/clamav-freshclam-ifupdown etc/network/if-up.d/
 debian/clamav-freshclam-ifupdown etc/network/if-down.d/
 debian/clamav-freshclam-ifupdown etc/ppp/ip-up.d/
 debian/clamav-freshclam-ifupdown etc/ppp/ip-down.d/
-debian/script usr/share/bug/clamav-freshclam/
diff --git a/debian/clamav-milter.dirs b/debian/clamav-milter.dirs
index 9bf0ff3..5229205 100644
--- a/debian/clamav-milter.dirs
+++ b/debian/clamav-milter.dirs
@@ -1,3 +1,2 @@
 etc/mail/m4/
 usr/share/lintian/overrides/
-usr/share/bug/clamav-milter
diff --git a/debian/clamav-milter.install b/debian/clamav-milter.install
index b291140..13e7bf9 100644
--- a/debian/clamav-milter.install
+++ b/debian/clamav-milter.install
@@ -1,3 +1,2 @@
 debian/tmp/usr/sbin/clamav-milter
 debian/clamav-milter.m4 /etc/mail/m4/
-debian/script usr/share/bug/clamav-milter/
diff --git a/debian/clamav.dirs b/debian/clamav.dirs
index 3530c5d..64168d7 100644
--- a/debian/clamav.dirs
+++ b/debian/clamav.dirs
@@ -1,3 +1,2 @@
 usr/bin
 usr/share/lintian/overrides/
-usr/share/bug/clamav
diff --git a/debian/clamav.install b/debian/clamav.install
index d0f761d..589adf2 100644
--- a/debian/clamav.install
+++ b/debian/clamav.install
@@ -1,3 +1,2 @@
 debian/tmp/usr/bin/clamscan
 debian/tmp/usr/bin/sigtool
-debian/script usr/share/bug/clamav/
diff --git a/debian/rules b/debian/rules
index 55c66f8..6b3ce8c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -106,7 +106,6 @@ clamav-base: install
 	dh_installdirs -p$@
 	dh_installdocs -p$@
 	dh_install -X.svn -p$@
-	chmod +x debian/$@/usr/share/bug/$@/script
 	dh_installchangelogs -p$@ ChangeLog 
 	cp debian/clamav-base.overrides debian/clamav-base/usr/share/lintian/overrides/clamav-base
 	dh_installdebconf -p$@
@@ -175,7 +174,6 @@ clamav: install
 	dh_installdirs -p$@
 	dh_installexamples -X.svn -p$@
 	dh_install -X.svn -p$@
-	chmod +x debian/$@/usr/share/bug/$@/script
 	dh_installman -p$@
 	dh_installchangelogs -p$@ ChangeLog 
 	dh_installdocs -p$@ 
@@ -198,7 +196,6 @@ clamav-freshclam: install
 	dh_installchangelogs -p$@ ChangeLog 
 	dh_installexamples -p$@
 	dh_install -X.svn -p$@
-	chmod +x debian/$@/usr/share/bug/$@/script
 	cp debian/clamav-freshclam.overrides debian/clamav-freshclam/usr/share/lintian/overrides/clamav-freshclam
 	dh_installlogcheck -p$@
 	dh_installinit -p$@ --noscripts
@@ -224,7 +221,6 @@ clamav-daemon: install
 	dh_testroot
 	dh_installdirs -p$@
 	dh_install -X.svn -p$@
-	chmod +x debian/$@/usr/share/bug/$@/script
 	cp debian/clamav-daemon.overrides debian/clamav-daemon/usr/share/lintian/overrides/clamav-daemon
 	dh_installlogcheck -p$@
 	dh_installinit -p$@
@@ -248,7 +244,6 @@ clamav-milter: install
 	dh_installdirs -p$@
 	dh_installdocs -p$@
 	dh_install -X.svn -p$@
-	chmod +x debian/$@/usr/share/bug/$@/script
 	cp debian/clamav-milter.overrides debian/clamav-milter/usr/share/lintian/overrides/clamav-milter
 	dh_installinit -p$@
 	dh_installman -p$@
diff --git a/debian/script b/debian/script
deleted file mode 100644
index 0ecc8df..0000000
--- a/debian/script
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-exec >&3
-
-echo "--- configuration ---"
-if [ -x "$(which clamconf)" ]; then
-  clamconf
-else
-  for file in clamd freshclam; do
-    [ ! -f "/etc/clamav/${file}.conf" ] || cat "/etc/clamav/${file}.conf" 
-  done
-fi
-
-echo
-echo "--- data dir ---"
-ls -l /var/lib/clamav

-- 
Debian repository for ClamAV