[Pkg-logwatch-general] r65 - in trunk: . debian patches

[willi-guest at alioth.debian.org]

Author: willi-guest
Date: 2007-05-27 14:15:19 +0000 (Sun, 27 May 2007)
New Revision: 65

Added:
   trunk/patches/01-logwatch-mailto-cron.diff
Modified:
   trunk/buildversion.sh
   trunk/debian/changelog
Log:
Add patch that allows --mailto to take no param in order to use that for cron
invocation


Modified: trunk/buildversion.sh
===================================================================
--- trunk/buildversion.sh	2007-05-16 20:20:02 UTC (rev 64)
+++ trunk/buildversion.sh	2007-05-27 14:15:19 UTC (rev 65)
@@ -1,9 +1,10 @@
 #!/bin/bash
 set -e
 
+#TODO: Get version from debian changelog
 VERSION=$1
 if [ -z "$VERSION" ]; then
-	VERSION=7.3.5
+	VERSION=7.3.6
 fi
 
 TARBALL=logwatch-$VERSION.tar.gz

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-05-16 20:20:02 UTC (rev 64)
+++ trunk/debian/changelog	2007-05-27 14:15:19 UTC (rev 65)
@@ -1,4 +1,4 @@
-logwatch (7.3.5-1~pre1) unstable; urgency=low
+logwatch (7.3.6-1~pre1) unstable; urgency=low
 
   * New upstream version:
     - closes: #317388 "Unmatched entries in Postfix section"

Added: trunk/patches/01-logwatch-mailto-cron.diff
===================================================================
--- trunk/patches/01-logwatch-mailto-cron.diff	                        (rev 0)
+++ trunk/patches/01-logwatch-mailto-cron.diff	2007-05-27 14:15:19 UTC (rev 65)
@@ -0,0 +1,26 @@
+diff -ur logwatch-7.3.6.b/scripts/logwatch.pl logwatch-7.3.6/scripts/logwatch.pl
+--- logwatch-7.3.6.b/scripts/logwatch.pl	2007-05-20 02:24:20.000000000 +0200
++++ logwatch-7.3.6/scripts/logwatch.pl	2007-05-27 15:35:04.000000000 +0200
+@@ -327,7 +327,7 @@
+              "logdir=s"     => \$Config{'logdir'},
+              "s|service=s@" => \@TempServiceList,
+              "p|print"      => \$Config{'print'},
+-             "m|mailto=s"   => \$tmp_mailto,
++             "m|mailto:s"   => \$tmp_mailto,
+              "save=s"       => \$Config{'save'},
+              "a|archives"   => \$Config{'archives'},
+              "debug=s"      => \$Config{'debug'},
+@@ -355,8 +355,10 @@
+    exit 0;
+ }
+ 
+-if ($tmp_mailto) {
+-   $Config{'mailto'} = $tmp_mailto;
++if (defined $tmp_mailto) {
++   if ($tmp_mailto ne "") {
++      $Config{'mailto'} = $tmp_mailto;
++   }
+    $Config{'print'} = 0;
+ }
+ 
+Nur in logwatch-7.3.6/scripts: .logwatch.pl.swp.