[Pkg-awstats-commits] [SCM] awstats Debian packaging branch, master, updated. debian/6.9.5.dfsg-3-10-g3f11eca

[Sergey B Kirpichev]

The following commit has been merged in the master branch:
commit c88e49a6592435ea6e58d8b7dadf5164a468461f
Author: Sergey B Kirpichev <skirpichev at gmail.com>
Date:   Sat Jun 12 20:10:29 2010 +0400

    Refresh patches.

diff --git a/debian/patches/1005_nested_includes.patch b/debian/patches/1005_nested_includes.patch
index f9862fe..3c68063 100644
--- a/debian/patches/1005_nested_includes.patch
+++ b/debian/patches/1005_nested_includes.patch
@@ -2,10 +2,8 @@ Description: Prevent nested includes from being prematurely closed.
 Author: Ken Neighbors <debian3 at ken.nsds.com>
 Bug-Debian: http://bugs.debian.org/575545
 
-Index: awstats/tools/awstats_buildstaticpages.pl
-===================================================================
---- awstats.orig/tools/awstats_buildstaticpages.pl	2010-06-12 19:49:47.000000000 +0400
-+++ awstats/tools/awstats_buildstaticpages.pl	2010-06-12 19:50:12.000000000 +0400
+--- a/tools/awstats_buildstaticpages.pl
++++ b/tools/awstats_buildstaticpages.pl
 @@ -197,6 +197,7 @@
  				warning("Warning: Perl versions before 5.6 cannot handle nested includes");
  				next;
@@ -14,10 +12,8 @@ Index: awstats/tools/awstats_buildstaticpages.pl
  		    if ( open( CONFIG_INCLUDE, $includeFile ) ) {
  				&Parse_Config( *CONFIG_INCLUDE , $level+1, $includeFile);
  				close( CONFIG_INCLUDE );
-Index: awstats/wwwroot/cgi-bin/awstats.pl
-===================================================================
---- awstats.orig/wwwroot/cgi-bin/awstats.pl	2010-06-12 19:49:39.000000000 +0400
-+++ awstats/wwwroot/cgi-bin/awstats.pl	2010-06-12 19:51:56.000000000 +0400
+--- a/wwwroot/cgi-bin/awstats.pl
++++ b/wwwroot/cgi-bin/awstats.pl
 @@ -1848,6 +1848,7 @@
  				);
  				next;
diff --git a/debian/patches/1008_extrasections_with_top.patch b/debian/patches/1008_extrasections_with_top.patch
index c54d564..ecfbb24 100644
--- a/debian/patches/1008_extrasections_with_top.patch
+++ b/debian/patches/1008_extrasections_with_top.patch
@@ -4,7 +4,7 @@ Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=1844793&group_id=1
 
 --- a/wwwroot/cgi-bin/awstats.pl
 +++ b/wwwroot/cgi-bin/awstats.pl
-@@ -15765,7 +15765,7 @@
+@@ -15766,7 +15766,7 @@
  				if ($Debug) { debug( "ExtraName$extranum", 2 ); }
  				print "$Center<a name=\"extra$extranum\">&nbsp;</a><br />";
  				my $title = $ExtraName[$extranum];
@@ -13,7 +13,7 @@ Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=1844793&group_id=1
  				print "<tr bgcolor=\"#$color_TableBGRowTitle\">";
  				print "<th>" . $ExtraFirstColumnTitle[$extranum] . "</th>";
  
-@@ -19397,7 +19397,7 @@
+@@ -19398,7 +19398,7 @@
  			if ($Debug) { debug( "ExtraName$extranum", 2 ); }
  			print "$Center<a name=\"extra$extranum\">&nbsp;</a><br />";
  			my $title = $ExtraName[$extranum];
diff --git a/debian/patches/1010_dirdata_permissions.patch b/debian/patches/1010_dirdata_permissions.patch
index 3b66fe9..417141c 100644
--- a/debian/patches/1010_dirdata_permissions.patch
+++ b/debian/patches/1010_dirdata_permissions.patch
@@ -4,7 +4,7 @@ Bug-Debian: http://bugs.debian.org/299148
 
 --- a/wwwroot/cgi-bin/awstats.pl
 +++ b/wwwroot/cgi-bin/awstats.pl
-@@ -2959,7 +2959,7 @@
+@@ -2960,7 +2960,7 @@
  	if ( !$MigrateStats && !-d $DirData ) {
  		if ($CreateDirDataIfNotExists) {
  			if ($Debug) { debug( " Make directory $DirData", 2 ); }
diff --git a/debian/patches/1015_ignore_case_for_rtsp.patch b/debian/patches/1015_ignore_case_for_rtsp.patch
index e6e6564..eee24b2 100644
--- a/debian/patches/1015_ignore_case_for_rtsp.patch
+++ b/debian/patches/1015_ignore_case_for_rtsp.patch
@@ -4,7 +4,7 @@ Bug-Debian: http://bugs.debian.org/350601
 
 --- a/wwwroot/cgi-bin/awstats.pl
 +++ b/wwwroot/cgi-bin/awstats.pl
-@@ -10869,7 +10869,7 @@
+@@ -10870,7 +10870,7 @@
  			( $LogType eq 'W' || $LogType eq 'S' )
  			&& (   $field[$pos_method] eq 'GET'
  				|| $field[$pos_method] eq 'mms'
diff --git a/debian/patches/2001_awstatsprog_path.patch b/debian/patches/2001_awstatsprog_path.patch
index 41fc874..86c10d0 100644
--- a/debian/patches/2001_awstatsprog_path.patch
+++ b/debian/patches/2001_awstatsprog_path.patch
@@ -3,7 +3,7 @@ Author: Sergey B Kirpichev <skirpichev at gmail.com>
 
 --- a/tools/awstats_buildstaticpages.pl
 +++ b/tools/awstats_buildstaticpages.pl
-@@ -307,8 +307,8 @@
+@@ -308,8 +308,8 @@
  # Check if AWSTATS prog is found
  my $AwstatsFound=0;
  if (-s "$Awstats") { $AwstatsFound=1; }

-- 
awstats Debian packaging