[Pkg-awstats-commits] [SCM] awstats Debian packaging branch, master, updated. debian/6.9.dfsg-1-223-gd4941db

Jonas Smedegaard dr at jones.dk
Thu Apr 1 10:18:41 UTC 2010 

The following commit has been merged in the master branch:
commit f3e4d3445d941ffa40b4a9eb7ed9062f80a43267
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Apr 1 12:15:07 2010 +0200

    Refresh patches (with compacting quilt options --no-timestamps --no-index -pab).

diff --git a/debian/patches/0007_russian_lang.patch b/debian/patches/0007_russian_lang.patch
index 6185b3c..06c8526 100644
--- a/debian/patches/0007_russian_lang.patch
+++ b/debian/patches/0007_russian_lang.patch
@@ -1,10 +1,8 @@
 Description: Updated Russian translation.
 Author: Sergey B Kirpichev <skirpichev at gmail.com>
 
-Index: awstats/wwwroot/cgi-bin/lang/awstats-ru.txt
-===================================================================
---- awstats.orig/wwwroot/cgi-bin/lang/awstats-ru.txt	2009-11-06 15:37:36.000000000 +0300
-+++ awstats/wwwroot/cgi-bin/lang/awstats-ru.txt	2009-11-08 01:35:08.000000000 +0300
+--- a/wwwroot/cgi-bin/lang/awstats-ru.txt
++++ b/wwwroot/cgi-bin/lang/awstats-ru.txt
 @@ -1,5 +1,5 @@
  # Russian message file
 -# $Revision: 1.15 $ - $Date: 2009/10/25 11:12:35 $
diff --git a/debian/patches/1002_disable_configdir.patch b/debian/patches/1002_disable_configdir.patch
index 6245f65..0edd61f 100644
--- a/debian/patches/1002_disable_configdir.patch
+++ b/debian/patches/1002_disable_configdir.patch
@@ -2,10 +2,8 @@ Description: Require AWSTATS_ENABLE_CONFIG_DIR environmental variable in order t
 Author: Charles Fry <debian at frogcircus.org>
 Bug-Debian: http://bugs.debian.org/365910
 
-Index: awstats/wwwroot/cgi-bin/awstats.pl
-===================================================================
---- awstats.orig/wwwroot/cgi-bin/awstats.pl	2009-11-06 15:37:36.000000000 +0300
-+++ awstats/wwwroot/cgi-bin/awstats.pl	2009-11-06 15:39:58.000000000 +0300
+--- a/wwwroot/cgi-bin/awstats.pl
++++ b/wwwroot/cgi-bin/awstats.pl
 @@ -1719,17 +1719,13 @@
  	my @PossibleConfigDir = ();
  
diff --git a/debian/patches/1003_redirect_to_STDERR.patch b/debian/patches/1003_redirect_to_STDERR.patch
index 3054de5..3bd6cad 100644
--- a/debian/patches/1003_redirect_to_STDERR.patch
+++ b/debian/patches/1003_redirect_to_STDERR.patch
@@ -2,10 +2,8 @@ Description: Redirect errors of offline scripts to STDERR.
 Author: Charles Fry <debian at frogcircus.org>
 Bug-Debian: http://bugs.debian.org/296435
 
-Index: awstats/tools/awstats_buildstaticpages.pl
-===================================================================
---- awstats.orig/tools/awstats_buildstaticpages.pl	2009-11-06 15:37:36.000000000 +0300
-+++ awstats/tools/awstats_buildstaticpages.pl	2009-11-06 15:42:01.000000000 +0300
+--- a/tools/awstats_buildstaticpages.pl
++++ b/tools/awstats_buildstaticpages.pl
 @@ -81,7 +81,7 @@
  # Return:		None
  #------------------------------------------------------------------------------
@@ -24,10 +22,8 @@ Index: awstats/tools/awstats_buildstaticpages.pl
  #    	}
  #	}
  }
-Index: awstats/tools/awstats_configure.pl
-===================================================================
---- awstats.orig/tools/awstats_configure.pl	2008-04-06 17:45:24.000000000 +0400
-+++ awstats/tools/awstats_configure.pl	2009-11-06 15:42:01.000000000 +0300
+--- a/tools/awstats_configure.pl
++++ b/tools/awstats_configure.pl
 @@ -88,7 +88,7 @@
  # error
  #-------------------------------------------------------
@@ -37,10 +33,8 @@ Index: awstats/tools/awstats_configure.pl
      exit 1;
  }
  
-Index: awstats/tools/awstats_exportlib.pl
-===================================================================
---- awstats.orig/tools/awstats_exportlib.pl	2009-11-06 15:37:36.000000000 +0300
-+++ awstats/tools/awstats_exportlib.pl	2009-11-06 15:44:14.000000000 +0300
+--- a/tools/awstats_exportlib.pl
++++ b/tools/awstats_exportlib.pl
 @@ -93,8 +93,8 @@
  	my $thirdmessage=shift||"";
  	my $donotshowsetupinfo=shift||0;
@@ -52,10 +46,8 @@ Index: awstats/tools/awstats_exportlib.pl
  	exit 1;
  }
  
-Index: awstats/tools/awstats_updateall.pl
-===================================================================
---- awstats.orig/tools/awstats_updateall.pl	2006-07-24 02:57:48.000000000 +0400
-+++ awstats/tools/awstats_updateall.pl	2009-11-06 15:42:01.000000000 +0300
+--- a/tools/awstats_updateall.pl
++++ b/tools/awstats_updateall.pl
 @@ -37,7 +37,7 @@
  # Return:		None
  #------------------------------------------------------------------------------
@@ -65,10 +57,8 @@ Index: awstats/tools/awstats_updateall.pl
      exit 1;
  }
  
-Index: awstats/tools/logresolvemerge.pl
-===================================================================
---- awstats.orig/tools/logresolvemerge.pl	2008-11-15 17:58:02.000000000 +0300
-+++ awstats/tools/logresolvemerge.pl	2009-11-06 15:42:01.000000000 +0300
+--- a/tools/logresolvemerge.pl
++++ b/tools/logresolvemerge.pl
 @@ -107,7 +107,7 @@
  # Return:		None
  #------------------------------------------------------------------------------
@@ -87,10 +77,8 @@ Index: awstats/tools/logresolvemerge.pl
  }
  
  #-----------------------------------------------------------------------------
-Index: awstats/tools/maillogconvert.pl
-===================================================================
---- awstats.orig/tools/maillogconvert.pl	2008-09-05 02:29:24.000000000 +0400
-+++ awstats/tools/maillogconvert.pl	2009-11-06 15:42:01.000000000 +0300
+--- a/tools/maillogconvert.pl
++++ b/tools/maillogconvert.pl
 @@ -56,7 +56,7 @@
  #-------------------------------------------------------
  
diff --git a/debian/patches/1004_perl_version.patch b/debian/patches/1004_perl_version.patch
index 3dc1b7f..135225a 100644
--- a/debian/patches/1004_perl_version.patch
+++ b/debian/patches/1004_perl_version.patch
@@ -4,10 +4,8 @@ Bug-Debian: http://bugs.debian.org/432096
 Bug-Debian: http://bugs.debian.org/440035
 Bug-Debian: http://bugs.debian.org/519319
 
-Index: awstats/wwwroot/cgi-bin/awstats.pl
-===================================================================
---- awstats.orig/wwwroot/cgi-bin/awstats.pl	2009-11-06 15:45:22.000000000 +0300
-+++ awstats/wwwroot/cgi-bin/awstats.pl	2009-11-06 15:48:29.000000000 +0300
+--- a/wwwroot/cgi-bin/awstats.pl
++++ b/wwwroot/cgi-bin/awstats.pl
 @@ -1842,7 +1842,7 @@
  					$includeFile = "$1$includeFile";
  				}
@@ -17,10 +15,8 @@ Index: awstats/wwwroot/cgi-bin/awstats.pl
  				warning(
  "Warning: Perl versions before 5.6 cannot handle nested includes"
  				);
-Index: awstats/tools/awstats_buildstaticpages.pl
-===================================================================
---- awstats.orig/tools/awstats_buildstaticpages.pl	2009-11-06 15:45:22.000000000 +0300
-+++ awstats/tools/awstats_buildstaticpages.pl	2009-11-06 15:45:55.000000000 +0300
+--- a/tools/awstats_buildstaticpages.pl
++++ b/tools/awstats_buildstaticpages.pl
 @@ -193,7 +193,7 @@
  			    # Correct relative include files
  				if ($FileConfig =~ /^(.*[\\\/])[^\\\/]*$/) { $includeFile = "$1$includeFile"; }
diff --git a/debian/patches/1008_extrasections_with_top.patch b/debian/patches/1008_extrasections_with_top.patch
index 793b920..c54d564 100644
--- a/debian/patches/1008_extrasections_with_top.patch
+++ b/debian/patches/1008_extrasections_with_top.patch
@@ -2,10 +2,8 @@ Description: Include the words (Top XXX) in the ExtraSection headings.
 Author: Patrick Collins <pcollins1 at users.sourceforge.net>
 Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=1844793&group_id=13764&atid=313764
 
-Index: awstats/wwwroot/cgi-bin/awstats.pl
-===================================================================
---- awstats.orig/wwwroot/cgi-bin/awstats.pl	2009-11-11 16:43:57.000000000 +0300
-+++ awstats/wwwroot/cgi-bin/awstats.pl	2009-11-11 16:43:59.000000000 +0300
+--- a/wwwroot/cgi-bin/awstats.pl
++++ b/wwwroot/cgi-bin/awstats.pl
 @@ -15765,7 +15765,7 @@
  				if ($Debug) { debug( "ExtraName$extranum", 2 ); }
  				print "$Center<a name=\"extra$extranum\">&nbsp;</a><br />";
diff --git a/debian/patches/1009_hurd_url.patch b/debian/patches/1009_hurd_url.patch
index a182211..7ac4b55 100644
--- a/debian/patches/1009_hurd_url.patch
+++ b/debian/patches/1009_hurd_url.patch
@@ -2,10 +2,8 @@ Description: Correct link to the GNU Hurd homepage.
 Author: Sylvain Rochet <gradator at gradator.net>
 Bug-Debian: http://bugs.debian.org/408086
 
-Index: awstats/wwwroot/cgi-bin/lib/operating_systems.pm
-===================================================================
---- awstats.orig/wwwroot/cgi-bin/lib/operating_systems.pm	2009-11-06 15:37:36.000000000 +0300
-+++ awstats/wwwroot/cgi-bin/lib/operating_systems.pm	2009-11-08 01:42:45.000000000 +0300
+--- a/wwwroot/cgi-bin/lib/operating_systems.pm
++++ b/wwwroot/cgi-bin/lib/operating_systems.pm
 @@ -245,7 +245,7 @@
  'linux','<a href="http://www.distrowatch.com/" title="Linux DistroWatch home page. Useful if you find the associated user agent string in your logs. [new window]" target="_blank">Linux (Unknown/unspecified)</a>',
  'linux','GNU Linux (Unknown or unspecified distribution)',
diff --git a/debian/patches/1010_dirdata_permissions.patch b/debian/patches/1010_dirdata_permissions.patch
index f22e4e6..3b66fe9 100644
--- a/debian/patches/1010_dirdata_permissions.patch
+++ b/debian/patches/1010_dirdata_permissions.patch
@@ -2,10 +2,8 @@ Description: Set $DirData permissions to 0755.
 Author: Charles Fry <debian at frogcircus.org>
 Bug-Debian: http://bugs.debian.org/299148
 
-Index: awstats/wwwroot/cgi-bin/awstats.pl
-===================================================================
---- awstats.orig/wwwroot/cgi-bin/awstats.pl	2009-11-08 01:42:43.000000000 +0300
-+++ awstats/wwwroot/cgi-bin/awstats.pl	2009-11-08 01:43:30.000000000 +0300
+--- a/wwwroot/cgi-bin/awstats.pl
++++ b/wwwroot/cgi-bin/awstats.pl
 @@ -2959,7 +2959,7 @@
  	if ( !$MigrateStats && !-d $DirData ) {
  		if ($CreateDirDataIfNotExists) {
diff --git a/debian/patches/1012_ipv6_strip_trailing_dot.patch b/debian/patches/1012_ipv6_strip_trailing_dot.patch
index f2e4cfd..b7ccf93 100644
--- a/debian/patches/1012_ipv6_strip_trailing_dot.patch
+++ b/debian/patches/1012_ipv6_strip_trailing_dot.patch
@@ -2,10 +2,8 @@ Description: Strip the trailing dot when making a reverse on IPv6 addresses.
 Author: Laurent Bigonville <bigon at debian.org>
 Bug-Debian: http://bugs.debian.org/397544
 
-Index: awstats/wwwroot/cgi-bin/plugins/ipv6.pm
-===================================================================
---- awstats.orig/wwwroot/cgi-bin/plugins/ipv6.pm	2009-11-06 15:37:36.000000000 +0300
-+++ awstats/wwwroot/cgi-bin/plugins/ipv6.pm	2009-11-08 01:51:19.000000000 +0300
+--- a/wwwroot/cgi-bin/plugins/ipv6.pm
++++ b/wwwroot/cgi-bin/plugins/ipv6.pm
 @@ -64,6 +64,7 @@
  	my $query = $resolver->query($reverseip, "PTR");
  	if (! defined($query)) { return; }
diff --git a/debian/patches/1013_yahoo_search.patch b/debian/patches/1013_yahoo_search.patch
index 5ae9b4c..bc57759 100644
--- a/debian/patches/1013_yahoo_search.patch
+++ b/debian/patches/1013_yahoo_search.patch
@@ -2,10 +2,8 @@ Description: Fix wrong search engine logging from yahoo sites.
 Author: <azhrarn at underhanded.org>
 Bug-Debian: http://bugs.debian.org/347426
 
-Index: awstats/wwwroot/cgi-bin/lib/search_engines.pm
-===================================================================
---- awstats.orig/wwwroot/cgi-bin/lib/search_engines.pm	2009-11-06 15:37:36.000000000 +0300
-+++ awstats/wwwroot/cgi-bin/lib/search_engines.pm	2009-11-08 01:52:17.000000000 +0300
+--- a/wwwroot/cgi-bin/lib/search_engines.pm
++++ b/wwwroot/cgi-bin/lib/search_engines.pm
 @@ -364,7 +364,7 @@
  'google\.'=>'translate\.google\.',
  'msn\.'=>'hotmail\.msn\.',
diff --git a/debian/patches/1014_websec_robot.patch b/debian/patches/1014_websec_robot.patch
index 79c8ff9..f66cb57 100644
--- a/debian/patches/1014_websec_robot.patch
+++ b/debian/patches/1014_websec_robot.patch
@@ -2,10 +2,8 @@ Description: Add WebSec to robots list.
 Author: Sergey B Kirpichev <skirpichev at gmail.com>
 Bug-Debian: http://bugs.debian.org/284149
 
-Index: awstats/wwwroot/cgi-bin/lib/browsers.pm
-===================================================================
---- awstats.orig/wwwroot/cgi-bin/lib/browsers.pm	2009-11-06 15:37:36.000000000 +0300
-+++ awstats/wwwroot/cgi-bin/lib/browsers.pm	2009-11-08 01:52:26.000000000 +0300
+--- a/wwwroot/cgi-bin/lib/browsers.pm
++++ b/wwwroot/cgi-bin/lib/browsers.pm
 @@ -242,7 +242,8 @@
  'POE\-Component\-Client\-HTTP',
  'mozilla',				# Must be at end because a lot of browsers contains mozilla in string
diff --git a/debian/patches/2001_awstatsprog_path.patch b/debian/patches/2001_awstatsprog_path.patch
index cb78eab..41fc874 100644
--- a/debian/patches/2001_awstatsprog_path.patch
+++ b/debian/patches/2001_awstatsprog_path.patch
@@ -1,10 +1,8 @@
 Description: Modify default path to awstats.pl in tools/.
 Author: Sergey B Kirpichev <skirpichev at gmail.com>
 
-Index: awstats/tools/awstats_buildstaticpages.pl
-===================================================================
---- awstats.orig/tools/awstats_buildstaticpages.pl	2009-11-08 01:52:11.000000000 +0300
-+++ awstats/tools/awstats_buildstaticpages.pl	2009-11-08 01:52:34.000000000 +0300
+--- a/tools/awstats_buildstaticpages.pl
++++ b/tools/awstats_buildstaticpages.pl
 @@ -307,8 +307,8 @@
  # Check if AWSTATS prog is found
  my $AwstatsFound=0;

-- 
awstats Debian packaging

More information about the Pkg-awstats-commits mailing list