[Pkg-logwatch-general] r67 - in trunk: contrib/conf/logfiles contrib/conf/services contrib/scripts/services contrib/scripts/shared debian

willi-guest at alioth.debian.org willi-guest at alioth.debian.org
Wed May 30 18:27:27 UTC 2007


Author: willi-guest
Date: 2007-05-30 18:27:27 +0000 (Wed, 30 May 2007)
New Revision: 67

Removed:
   trunk/contrib/conf/logfiles/dpkg.conf
   trunk/contrib/conf/services/dpkg.conf
   trunk/contrib/scripts/services/dpkg
   trunk/contrib/scripts/shared/applyeuro2date
Modified:
   trunk/debian/changelog
Log:
Delete dpkg files
7.3.6-1 release


Deleted: trunk/contrib/conf/logfiles/dpkg.conf
===================================================================
--- trunk/contrib/conf/logfiles/dpkg.conf	2007-05-27 14:49:03 UTC (rev 66)
+++ trunk/contrib/conf/logfiles/dpkg.conf	2007-05-30 18:27:27 UTC (rev 67)
@@ -1,20 +0,0 @@
-##########################################################################
-# $Id: $
-##########################################################################
-
-########################################################
-# Created by HMR 2/28/06
-# Modified by Willi Mann <willi at wm1.at>
-#
-# What actual file?  Defaults to LogPath if not absolute path....
-LogFile = dpkg.log
-LogFile = dpkg.log.1
-# If the archives are searched, here is one or more line
-# (optionally containing wildcards) that tell where they are...
-# Note: if these are gzipped, you need to end with a .gz even if
-#       you use wildcards...
-Archive = dpkg.log.*.gz
-
-# HMR 3/1/06 use custom applyeurodate script to filter out European time stamps
-# ./scripts/shared/applyeurodate
-*ApplyEuro2Date

Deleted: trunk/contrib/conf/services/dpkg.conf
===================================================================
--- trunk/contrib/conf/services/dpkg.conf	2007-05-27 14:49:03 UTC (rev 66)
+++ trunk/contrib/conf/services/dpkg.conf	2007-05-30 18:27:27 UTC (rev 67)
@@ -1,20 +0,0 @@
-###########################################################################
-# $Id: $
-###########################################################################
-
-# You can put comments anywhere you want to.  They are effective for the
-# rest of the line.
-
-# this is in the format of <name> = <value>.  Whitespace at the beginning
-# and end of the lines is removed.  Whitespace before and after the = sign
-# is removed.  Everything is case *insensitive*.
-
-# Yes = True  = On  = 1
-# No  = False = Off = 0
-
-Title = dpkg status changes
-
-# Which logfile group...
-LogFile = dpkg
-
-

Deleted: trunk/contrib/scripts/services/dpkg
===================================================================
--- trunk/contrib/scripts/services/dpkg	2007-05-27 14:49:03 UTC (rev 66)
+++ trunk/contrib/scripts/services/dpkg	2007-05-30 18:27:27 UTC (rev 67)
@@ -1,66 +0,0 @@
-#!/usr/bin/perl -w
-#
-# Copyright 2006 by Willi Mann <willi at wm1.at>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with this program; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA  02111-1307  USA.
-
-use strict;
-
-my @install;
-my @upgrade;
-my @remove;
-my @purge;
-
-my @unknown;
-
-while(my $line=<STDIN>) {
-	chomp $line;
-	if ( my ( $do, $pkg, $ver1, $ver2) = ( $line =~ /^\S+ \S+ (install|upgrade|remove|purge) (\S+) (\S+)(?: (\S+))?/ )) {
-		if(($do eq "remove" or $do eq "purge") and ($ver1 ne $ver2)) {
-			push @unknown, $line;
-		} elsif ($do eq "remove") {
-			push @remove, "$pkg $ver1";
-		} elsif ( $do eq "purge") {
-			push @purge, "$pkg $ver1";
-		} elsif ($ver1 =~ /[<>]/) {
-			push @install, "$pkg $ver2";
-		} else {
-			push @upgrade, "$pkg $ver1 => $ver2";
-		}
-	} elsif ( $line =~ /^\S+ \S+ status / ) {
-		#ignore
-	} else {
-		push @unknown, $line;
-	}
-}
-
-my @k = ( "Installed" , \@install, 
-          "Upgraded" , \@upgrade, 
-	  "Removed", \@remove, 
-	  "Purged", \@purge, 
-	  "Unknown lines", \@unknown);
-
-while (@k > 0) {
-	my $text = shift @k;
-	my $array = shift @k;
-	if(@$array) {
-		print "\n$text:\n";
-		foreach my $line (sort @$array) {
-			print "   $line\n";
-		}
-
-	}
-}

Deleted: trunk/contrib/scripts/shared/applyeuro2date
===================================================================
--- trunk/contrib/scripts/shared/applyeuro2date	2007-05-27 14:49:03 UTC (rev 66)
+++ trunk/contrib/scripts/shared/applyeuro2date	2007-05-30 18:27:27 UTC (rev 67)
@@ -1,37 +0,0 @@
-#!/usr/bin/perl
-##########################################################################
-# $Id: $
-##########################################################################
-
-########################################################
-#  written by (or more: copied by)
-#           Willi Mann <willi at wm1.at>
-########################################################
-
-#
-## Modified from applyeurodate by debian at onerussian.com to accept dates
-## as reported by dpkg:
-#2006-09-04 11:17:31 upgrade cvs 1:1.12.13-3 1:1.12.13-4
-#
-# This script is licensed under the same terms as logwatch, ie under
-# permissive X11 license (see /usr/share/doc/logwatch/copyright for more
-# details)
-#
-use Logwatch ':dates';
-
-my $Debug = $ENV{'LOGWATCH_DEBUG'} || 0;
-
-$SearchDate = TimeFilter('%Y-%m-%d %H:%M:%S');
-
-if ( $Debug > 5 ) {
-   print STDERR "DEBUG: Inside ApplyEuro2Date...\n";
-   print STDERR "DEBUG: Looking For: " . $SearchDate . "\n";
-}
-
-while (defined($ThisLine = <STDIN>)) {
-   if ($ThisLine =~ m/^$SearchDate /o) {
-      print $ThisLine;
-   }
-}
-
-# vi: shiftwidth=3 syntax=perl tabstop=3 et

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-05-27 14:49:03 UTC (rev 66)
+++ trunk/debian/changelog	2007-05-30 18:27:27 UTC (rev 67)
@@ -1,4 +1,4 @@
-logwatch (7.3.6-1~pre1) unstable; urgency=low
+logwatch (7.3.6-1) unstable; urgency=low
 
   * New upstream version:
     - closes: #317388 "Unmatched entries in Postfix section"
@@ -10,7 +10,8 @@
   * Avoid using syslog for maillog services. This fixes double reports of 
     postfix, courier and maybe some others. 
   * Add patch that allows --mailto to take no email address. This is used in
-    the cron script.
+    the cron script. Do not rely on this, the print/encode options will 
+    probably be changed in the next version.
   * Add XS-Vcs-Svn and XS-Vcs-Browser to debian/control.
   * No longer set DH_COMPAT in debian/rules, use debian/compat. (thanks to 
     lintian). Set compatibility to version 5 and depend on it. 




More information about the Pkg-logwatch-general mailing list