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

[willi-guest at alioth.debian.org]

Author: willi-guest
Date: 2008-07-23 08:10:20 +0000 (Wed, 23 Jul 2008)
New Revision: 79

Added:
   trunk/patches/03-manpage-filename-for-save.diff
   trunk/patches/04-dpkg-unknown-lines.diff
Modified:
   trunk/debian/changelog
   trunk/prepare_for_patch.sh
Log:
Prepare for
logwatch (7.3.6.cvs20080702-2) unstable; urgency=low


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-07-05 07:08:14 UTC (rev 78)
+++ trunk/debian/changelog	2008-07-23 08:10:20 UTC (rev 79)
@@ -1,13 +1,18 @@
 logwatch (7.3.6.cvs20080702-2) unstable; urgency=low
 
-  * DO NOT FORGET TO credit Michael Tautschnig this time
+  * add Michael Tautschnig to former changelog of former version, crediting
+    him for his hard work fixing the unknown copyright holders issue.
+  * Fix manpage: filename instead of save to save output to a file
+    (closes: #441358)
+  * servicess/dpkg: Ignore some previously unknown lines (closes: #491972,
+    thanks Jeremie Bouttier for the report)
 
  -- Willi Mann <willi at wm1.at>  Sat, 05 Jul 2008 08:54:16 +0200
 
 logwatch (7.3.6.cvs20080702-1) unstable; urgency=medium
 
   * New upstream CVS snapshot
-    - Fixes issue of unknown copyright holders
+    - Fixes issue of unknown copyright holders (thanks Michael Tautschnig)
     - fixes postfix warnings, closes: #461227
     - fixes a typo in services/secure script, closes: #432118
     - print arguments in case of failure executing cat (logwatch.pl), 

Added: trunk/patches/03-manpage-filename-for-save.diff
===================================================================
--- trunk/patches/03-manpage-filename-for-save.diff	                        (rev 0)
+++ trunk/patches/03-manpage-filename-for-save.diff	2008-07-23 08:10:20 UTC (rev 79)
@@ -0,0 +1,21 @@
+diff -uNr logwatch-7.3.6.cvs20080702.b/logwatch.8 logwatch-7.3.6.cvs20080702/logwatch.8
+--- logwatch-7.3.6.cvs20080702.b/logwatch.8	2008-07-23 09:12:53.000000000 +0200
++++ logwatch-7.3.6.cvs20080702/logwatch.8	2008-07-23 09:13:59.000000000 +0200
+@@ -17,7 +17,7 @@
+ .I range
+ .B ] [--debug
+ .I level
+-.B ] [--save
++.B ] [--filename
+ .I file-name
+ .B ] [--logdir
+ .I directory
+@@ -89,7 +89,7 @@
+ can range from 0 to 100.  This will
+ .I really
+ clutter up your output.  You probably don't want to use this.
+-.IP "\fB--save\fR file-name"
++.IP "\fB--filename\fR file-name"
+ Save the output to
+ .I file-name
+ instead of displaying or mailing it.

Added: trunk/patches/04-dpkg-unknown-lines.diff
===================================================================
--- trunk/patches/04-dpkg-unknown-lines.diff	                        (rev 0)
+++ trunk/patches/04-dpkg-unknown-lines.diff	2008-07-23 08:10:20 UTC (rev 79)
@@ -0,0 +1,13 @@
+diff -uNr logwatch-7.3.6.cvs20080702.b/scripts/services/dpkg logwatch-7.3.6.cvs20080702/scripts/services/dpkg
+--- logwatch-7.3.6.cvs20080702.b/scripts/services/dpkg	2008-07-02 08:57:03.000000000 +0200
++++ logwatch-7.3.6.cvs20080702/scripts/services/dpkg	2008-07-23 09:17:23.000000000 +0200
+@@ -56,7 +56,7 @@
+ 		} else {
+ 			push @upgrade, "$pkg $ver1 => $ver2";
+ 		}
+-	} elsif ( $line =~ /^\S+ \S+ status / ) {
++	} elsif ( $line =~ /^\S+ \S+ (status|configure|startup|trigproc) / ) {
+ 		#ignore
+ 	} else {
+ 		push @unknown, $line;
+Binärdateien logwatch-7.3.6.cvs20080702.b/scripts/services/.dpkg.swp and logwatch-7.3.6.cvs20080702/scripts/services/.dpkg.swp sind verschieden.

Modified: trunk/prepare_for_patch.sh
===================================================================
--- trunk/prepare_for_patch.sh	2008-07-05 07:08:14 UTC (rev 78)
+++ trunk/prepare_for_patch.sh	2008-07-23 08:10:20 UTC (rev 79)
@@ -5,5 +5,6 @@
 DIR=logwatch-$VERSION
 
 ./buildversion.sh
+rm -fr $DIR.b
 mv $DIR $DIR.b
 ./buildversion.sh