[Pkg-awstats-commits] [SCM] awstats Debian packaging branch, master, updated. debian/6.9.5.dfsg-4-13-g63330d5

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit 12aa832e7cab9e2d3b03bcf0f54c3a0387c4e3fc
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Dec 24 00:03:37 2010 +0100

    Unfuzz patches.

diff --git a/debian/patches/1004_perl_version.patch b/debian/patches/1004_perl_version.patch
index 135225a..2b164c4 100644
--- a/debian/patches/1004_perl_version.patch
+++ b/debian/patches/1004_perl_version.patch
@@ -6,7 +6,7 @@ Bug-Debian: http://bugs.debian.org/519319
 
 --- a/wwwroot/cgi-bin/awstats.pl
 +++ b/wwwroot/cgi-bin/awstats.pl
-@@ -1842,7 +1842,7 @@
+@@ -1847,7 +1847,7 @@
  					$includeFile = "$1$includeFile";
  				}
  			}
diff --git a/debian/patches/1008_extrasections_with_top.patch b/debian/patches/1008_extrasections_with_top.patch
index ecfbb24..1c48d54 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
-@@ -15766,7 +15766,7 @@
+@@ -15775,7 +15775,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>";
  
-@@ -19398,7 +19398,7 @@
+@@ -19407,7 +19407,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 417141c..62a2325 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
-@@ -2960,7 +2960,7 @@
+@@ -2965,7 +2965,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 eee24b2..9d3f70d 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
-@@ -10870,7 +10870,7 @@
+@@ -10879,7 +10879,7 @@
  			( $LogType eq 'W' || $LogType eq 'S' )
  			&& (   $field[$pos_method] eq 'GET'
  				|| $field[$pos_method] eq 'mms'
diff --git a/debian/patches/1016_report_permissions_problem_for_configs.patch b/debian/patches/1016_report_permissions_problem_for_configs.patch
index 2beabed..87e740e 100644
--- a/debian/patches/1016_report_permissions_problem_for_configs.patch
+++ b/debian/patches/1016_report_permissions_problem_for_configs.patch
@@ -4,7 +4,7 @@ Bug-Debian: http://bugs.debian.org/572353
 
 --- a/wwwroot/cgi-bin/awstats.pl
 +++ b/wwwroot/cgi-bin/awstats.pl
-@@ -1745,11 +1745,17 @@
+@@ -1750,11 +1750,17 @@
  			$FileSuffix = ".$SiteConfig";
  			last;
  		}

-- 
awstats Debian packaging