[Pkg-awstats-commits] [SCM] awstats Debian packaging branch, master, updated. debian/7.0_dfsg-5-4-ga320407

[Sergey B Kirpichev]

The following commit has been merged in the master branch:
commit 39a464940035d5284fbf0e8627438ea9a6ef099d
Author: Sergey B Kirpichev <skirpichev at gmail.com>
Date:   Mon Jan 23 16:20:36 2012 +0400

    Document pipe's usage in LogFile directive (Closes: #435028)

diff --git a/debian/patches/1020_LogFile_usage_docs.patch b/debian/patches/1020_LogFile_usage_docs.patch
new file mode 100644
index 0000000..3a6df9f
--- /dev/null
+++ b/debian/patches/1020_LogFile_usage_docs.patch
@@ -0,0 +1,38 @@
+Description: Document pipe's usage in LogFile directive.
+Author: Sergey B Kirpichev <skirpichev at gmail.com>
+Bug-Debian: http://bugs.debian.org/435028
+
+---
+ docs/awstats_config.html           |    4 ++--
+ wwwroot/cgi-bin/awstats.model.conf |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+--- a/docs/awstats_config.html
++++ b/docs/awstats_config.html
+@@ -274,7 +274,7 @@
+ <br># Example: "/var/log/access_log.%YYYY-0%MM-0%DD-0.log"
+ <br># Example: "C:/WINNT/system32/LogFiles/W3SVC1/ex%YY-24%MM-24%DD-24.log"
+ <br># You can also use a pipe if log file come from a pipe.
+-<br># Example: "gzip -d </var/log/apache/access.log.gz |"
++<br># Example: "gzip -cd /var/log/apache/access.log.gz |"
+ <br># If there is several log files from load balancing servers :
+ <br># Example: "/pathtotools/logresolvemerge.pl *.log |"
+ <br>#
+@@ -1826,4 +1826,4 @@
+ 	document.writeln("Last revision: "+date);
+ </script>
+ 
+-</body></html>
+\ No newline at end of file
++</body></html>
+--- a/wwwroot/cgi-bin/awstats.model.conf
++++ b/wwwroot/cgi-bin/awstats.model.conf
+@@ -44,7 +44,7 @@
+ # Example: "/var/log/access_log.%YYYY-0%MM-0%DD-0.log"
+ # Example: "C:/WINNT/system32/LogFiles/W3SVC1/ex%YY-24%MM-24%DD-24.log"
+ # You can also use a pipe if log file come from a pipe :
+-# Example: "gzip -d </var/log/apache/access.log.gz |"
++# Example: "gzip -cd /var/log/apache/access.log.gz |"
+ # If there are several log files from load balancing servers :
+ # Example: "/pathtotools/logresolvemerge.pl *.log |"
+ #
diff --git a/debian/patches/series b/debian/patches/series
index 84e7b5c..04a58a7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,5 +12,6 @@
 1017_fix_html_output_markup.patch
 1018_perl5-14.patch
 1019_allow_frame_resize.patch
+1020_LogFile_usage_docs.patch
 2001_awstatsprog_path.patch
 2002_nboflastupdatelookuptosave.patch

-- 
awstats Debian packaging