From: eldy <>
Date: Wed, 9 Dec 2009 11:07:16 +0000 (+0000)
Subject: New: Detect windows 7
X-Git-Tag: AWSTATS_7_0_BETA2~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af4e9dcd05e50416129928d70a8f8bedff421a94;p=thirdparty%2FAWStats.git

New: Detect windows 7
---

diff --git a/README.TXT b/README.TXT
index 32e80dc6..3d44f593 100644
--- a/README.TXT
+++ b/README.TXT
@@ -13,8 +13,8 @@ server log files (and even ftp servers or mail logs) on all Operating Systems.
 
 License: GNU GPL (GNU General Public License. See LICENSE file),
          OSI Certified Open Source Software license.
-Version: 6.95
-Release date: October 2009
+Version: 6.96
+Release date: January 2010
 Platforms: All (Linux, NT, BSD, Solaris and other *NIX's, BeOS, OS/2...)
 Author: Laurent Destailleur <eldy@users.sourceforge.net>
 AWStats official web site and latest version: http://awstats.sourceforge.net
@@ -148,7 +148,7 @@ Tests and results are available in AWStats documentation, in docs/ directory.
 
 IV - ABOUT THE AUTHOR, LICENSE AND SUPPORT
 -----------------------------------------
-Copyright (C) 2000-2009 - Laurent Destailleur - eldy@users.sourceforge.net
+Copyright (C) 2000-2010 - Laurent Destailleur - eldy@users.sourceforge.net
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/docs/awstats_changelog.txt b/docs/awstats_changelog.txt
index 9b2c2e2a..c52a17db 100644
--- a/docs/awstats_changelog.txt
+++ b/docs/awstats_changelog.txt
@@ -3,6 +3,12 @@ AWStats Changelog
 $Revision$ - $Author$ - $Date$
 
 
+***** 6.96 *****
+
+New features/improvements:
+- Detect Windows 7
+
+
 ***** 6.95 *****
 
 New features/improvements:
diff --git a/make/exe/awstats.nsi b/make/exe/awstats.nsi
index 33a5cb0f..b1fd35c0 100644
--- a/make/exe/awstats.nsi
+++ b/make/exe/awstats.nsi
@@ -5,10 +5,10 @@
 
 
 !define MUI_PROD "AWStats" ;Define your own software name here
-#!define MUI_VERSION_DOT "6.95" ;Define your own software version here
+#!define MUI_VERSION_DOT "6.96" ;Define your own software version here
 !define MUI_PUBLISHER "Laurent Destailleur"
 !define MUI_URL "http://awstats.sourceforge.net"
-!define MUI_COMMENTS "copyright 2000/2009 Laurent Destailleur"
+!define MUI_COMMENTS "copyright 2000/2010 Laurent Destailleur"
 !define MUI_HELPLINK "http://awstats.sourceforge.net/docs/index.html"
 !define MUI_URLUPDATE "http://awstats.sourceforge.net"
 
diff --git a/make/makepack-awstats.pl b/make/makepack-awstats.pl
index e4db34ce..1d954904 100644
--- a/make/makepack-awstats.pl
+++ b/make/makepack-awstats.pl
@@ -10,7 +10,7 @@ use Cwd;
 
 $PROJECT="awstats";
 $MAJOR="6";
-$MINOR="95";
+$MINOR="96";
 $RPMSUBVERSION="1";
 
 @LISTETARGET=("TGZ","ZIP","RPM","DEB","EXE");   # Possible packages
diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
index 9af325ad..a3d758b0 100644
--- a/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
@@ -26,7 +26,7 @@ use vars qw/ $REVISION $VERSION /;
 $REVISION = '$Revision$';
 $REVISION =~ /\s(.*)\s/;
 $REVISION = $1;
-$VERSION  = "6.95 (build $REVISION)";
+$VERSION  = "6.96 (build $REVISION)";
 
 # ----- Constants -----
 use vars qw/
@@ -9797,7 +9797,7 @@ if ( ( !$ENV{'GATEWAY_INTERFACE'} ) && ( !$SiteConfig ) ) {
 		'browsers',       'domains', 'operating_systems', 'robots',
 		'search_engines', 'worms'
 	);
-	print "----- $PROG $VERSION (c) 2000-2009 Laurent Destailleur -----\n";
+	print "----- $PROG $VERSION (c) 2000-2010 Laurent Destailleur -----\n";
 	print
 "AWStats is a free web server logfile analyzer to show you advanced web\n";
 	print "statistics.\n";
diff --git a/wwwroot/cgi-bin/lib/operating_systems.pm b/wwwroot/cgi-bin/lib/operating_systems.pm
index 41fa4d3d..0272c441 100644
--- a/wwwroot/cgi-bin/lib/operating_systems.pm
+++ b/wwwroot/cgi-bin/lib/operating_systems.pm
@@ -121,7 +121,7 @@
 %OSHashID	= (
 # Windows OS family
 'windows[_+ ]?2005','winlong','windows[_+ ]nt[_+ ]6\.0','winlong',
-'windows[_+ ]?2008','win2008','windows[_+ ]nt[_+ ]6\.1','win2008',
+'windows[_+ ]?2008','win2008','windows[_+ ]nt[_+ ]6\.1','win7',
 'windows[_+ ]?vista','winvista','windows[_+ ]nt[_+ ]6','winvista',
 'windows[_+ ]?2003','win2003','windows[_+ ]nt[_+ ]5\.2','win2003',
 'windows[_+ ]xp','winxp','windows[_+ ]nt[_+ ]5\.1','winxp', 'syndirella', 'winxp',
@@ -208,6 +208,7 @@
 #-----------------------------------------------------------
 %OSHashLib      = (
 # Windows family OS
+'win7','<a href="http://www.microsoft.com/windows/" title="Windows 7 home page [new window]" target="_blank">Windows 7</a>',
 'winlong','<a href="http://www.microsoft.com/windows/" title="Windows Vista home page [new window]" target="_blank">Windows Vista (LongHorn)</a>',
 'win2008','<a href="http://www.microsoft.com/windowsserver2008/" title="Windows 2008 home page [new window]" target="_blank">Windows 2008</a>',
 'winvista','<a href="http://www.microsoft.com/windowsvista/" title="Windows Vista home page [new window]" target="_blank">Windows Vista</a>',