[Pkg-logwatch-general] r75 - in trunk/debian: . dist.conf

Fri Jul 4 18:17:06 UTC 2008

Author: willi-guest
Date: 2008-07-04 18:17:05 +0000 (Fri, 04 Jul 2008)
New Revision: 75

Removed:
   trunk/debian/logwatch.preinst
Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/dirs
   trunk/debian/dist.conf/logwatch.conf
   trunk/debian/logwatch.00logwatch.cron.daily
   trunk/debian/rules
Log:
  * update to Standards-Version 3.8.0 (no changes)
  * remove preinst script that was used in upgrades from sarge
  * No longer override upstream detail level to medium, closes: #441144
  * Fix lintian warning: homepage-in-description
  * The cron script now explicitly mails to root



Modified: trunk/debian/changelog
===================================================================

--- trunk/debian/changelog	2008-07-04 17:45:28 UTC (rev 74)
+++ trunk/debian/changelog	2008-07-04 18:17:05 UTC (rev 75)
@@ -9,6 +9,11 @@
     - ignore some more pam_unix lines in proftpd-messages, closes: #480761
   * add patch by Justin Pryzby to fix an assignment instead of an regex 
     in the services/cron script, closes: #488737
+  * update to Standards-Version 3.8.0 (no changes)
+  * remove preinst script that was used in upgrades from sarge
+  * No longer override upstream detail level to medium, closes: #441144
+  * Fix lintian warning: homepage-in-description
+  * The cron script now explicitly mails to root
 
  -- Willi Mann <willi at wm1.at>  Fri, 04 Jul 2008 16:51:36 +0200
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2008-07-04 17:45:28 UTC (rev 74)
+++ trunk/debian/control	2008-07-04 18:17:05 UTC (rev 75)
@@ -3,9 +3,10 @@
 Priority: optional
 Maintainer: Willi Mann <willi at wm1.at>
 Build-Depends: debhelper (>> 5.0.0)
-Standards-Version: 3.7.2.0
+Standards-Version: 3.8.0
 XS-Vcs-Svn: svn://svn.debian.org/pkg-logwatch/trunk
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-logwatch/trunk/
+Homepage: http://www.logwatch.org/
 
 Package: logwatch
 Architecture: all
@@ -23,6 +24,4 @@
  Logwatch generally ignores the time component in the output, that means, 
  you will know that the reported event was logged in the requested range of 
  time, but you will have to go to the raw log files to get the exact details.
- .
- Homepage: http://www.logwatch.org/
 

Modified: trunk/debian/dirs
===================================================================
--- trunk/debian/dirs	2008-07-04 17:45:28 UTC (rev 74)
+++ trunk/debian/dirs	2008-07-04 18:17:05 UTC (rev 75)
@@ -1,2 +1 @@
-usr/bin
 usr/sbin

Modified: trunk/debian/dist.conf/logwatch.conf
===================================================================
--- trunk/debian/dist.conf/logwatch.conf	2008-07-04 17:45:28 UTC (rev 74)
+++ trunk/debian/dist.conf/logwatch.conf	2008-07-04 18:17:05 UTC (rev 75)
@@ -1,4 +1,3 @@
-Detail = Med
 mailer = "/usr/sbin/sendmail -t"
 TmpDir = /tmp
 MailFrom = root

Modified: trunk/debian/logwatch.00logwatch.cron.daily
===================================================================
--- trunk/debian/logwatch.00logwatch.cron.daily	2008-07-04 17:45:28 UTC (rev 74)
+++ trunk/debian/logwatch.00logwatch.cron.daily	2008-07-04 18:17:05 UTC (rev 75)
@@ -4,4 +4,4 @@
 test -x /usr/share/logwatch/scripts/logwatch.pl || exit 0
 
 #execute
-/usr/sbin/logwatch --mailto
+/usr/sbin/logwatch --mailto root

Deleted: trunk/debian/logwatch.preinst
===================================================================
--- trunk/debian/logwatch.preinst	2008-07-04 17:45:28 UTC (rev 74)
+++ trunk/debian/logwatch.preinst	2008-07-04 18:17:05 UTC (rev 75)
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-set -e 
-
-LASTVERSION="6.9"
-FILES="ignore.conf logwatch.conf logfiles/autorpm.conf logfiles/cisco.conf logfiles/clam-update.conf logfiles/cron.conf logfiles/emerge.conf logfiles/exim.conf logfiles/extreme-networks.conf logfiles/http.conf logfiles/maillog.conf logfiles/messages.conf logfiles/netopia.conf logfiles/netscreen.conf logfiles/pureftp.conf logfiles/rt314.conf logfiles/samba.conf logfiles/secure.conf logfiles/sonicwall.conf logfiles/tac_acc.conf logfiles/up2date.conf logfiles/vsftpd.conf logfiles/xferlog.conf logfiles/yum.conf logfiles/kernel.conf logfiles/daemon.conf logfiles/syslog.conf services/afpd.conf services/amavis.conf services/arpwatch.conf services/audit.conf services/automount.conf services/autorpm.conf services/cisco.conf services/clam-update.conf services/clamav-milter.conf services/clamav.conf services/courier.conf services/cron.conf services/dhcpd.conf services/emerge.conf services/exim.conf services/extreme-networks.conf services/ftpd-messages.conf services/ftpd-xferlog.conf services/http.conf services/identd.conf services/imapd.conf services/in.qpopper.conf services/init.conf services/ipop3d.conf services/kernel.conf services/mailscanner.conf services/modprobe.conf services/mountd.conf services/named.conf services/netopia.conf services/netscreen.conf services/oidentd.conf services/openvpn.conf services/pam.conf services/pam_pwdb.conf services/pam_unix.conf services/pluto.conf services/pop3.conf services/portsentry.conf services/postfix.conf services/pound.conf services/proftpd-messages.conf services/pureftpd.conf services/qmail.conf services/raid.conf services/rt314.conf services/samba.conf services/saslauthd.conf services/scsi.conf services/secure.conf services/sendmail-largeboxes.conf services/sendmail.conf services/shaperd.conf services/smartd.conf services/sonicwall.conf services/sshd.conf services/sshd2.conf services/stunnel.conf services/sudo.conf services/syslogd.conf services/tac_acc.conf services/up2date.conf services/vpopmail.conf services/vsftpd.conf services/xntpd.conf services/yum.conf services/zz-disk_space.conf services/zz-fortune.conf services/zz-network.conf"
-
-
-# Remove a no-longer used conffile
-rm_conffile() {
-    CONFFILE="$1"
-
-    if [ -e "$CONFFILE" ]; then
-        md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
-        old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE'{s/.* //;p}}\" /var/lib/dpkg/status`"
-        if [ "$md5sum" != "$old_md5sum" ]; then
-            echo "Obsolete conffile $CONFFILE has been modified by you."
-            echo "Saving as $CONFFILE.dpkg-bak ..."
-            echo "Merge your local changes back to $CONFFILE!"
-            mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
-        else
-            echo "Removing obsolete conffile $CONFFILE ..."
-            rm -f "$CONFFILE"
-        fi
-    fi
-}
-
-case "$1" in
-install|upgrade)
-    if dpkg --compare-versions "$2" le "$LASTVERSION"; then
-        for CFILE in $FILES; do
-		rm_conffile /etc/logwatch/conf/$CFILE
-        done
-    fi
-esac
-
-#DEBHELPER#
-
-exit 0

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-07-04 17:45:28 UTC (rev 74)
+++ trunk/debian/rules	2008-07-04 18:17:05 UTC (rev 75)
@@ -74,7 +74,7 @@
 			mv $$i $(SHAREDIR)/default.conf/$${i##$(SHAREDIR)/dist.conf/}; \
 		fi \
 	done
-	
+
 	mkdir -p $(DESTDIR)/usr/sbin
 
 #Ensure all configuration files have 0644
@@ -83,6 +83,8 @@
 # Add #!/usr/bin/perl at the top of the scripts (mainly for debugging and avoiding lintian warnings)
 	for i in `find $(SHAREDIR)/scripts -type f `; do head -n1 $$i | grep -q /usr/bin/perl || sed '1i #!/usr/bin/perl' --in-place $$i;done 
 
+	# Remove empty directories
+	find $(SHAREDIR) -depth -type d -empty -exec rmdir {} \;
 
 # Build architecture-independent files here.
 binary-indep: build install


