New: Detect windows 7

diff --git a/README.TXT b/README.TXT
index 32e80dc654ca4687fd89ce93ed37974e23425607..3d44f593d65100cb28bcadcab592edd9d903b739 100644 (file)
--- 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 9b2c2e2adaf17b697eda195365071f899c858904..c52a17dbd9668d82a274a05b52e2fd698b673ba2 100644 (file)
--- 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 33a5cb0f1a43645dc62e57cd68164e78cb2e1430..b1fd35c005a5860d0dcba1566c1b4f694cf07cdf 100644 (file)
--- 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 e4db34cef71822c829a037ff76a87483a0e54e3a..1d954904cf25fb964eb90d777fcec33de054e915 100644 (file)
--- 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 9af325ad7b0f26c86d84f03aa138c060f1be014b..a3d758b06acfbd07db5f2588962b7927de8dcd95 100644 (file)
--- 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 41fa4d3d49c8b86bf9ac6dbd8dda342b7f284626..0272c441a4750c31cd8e5f7376b9dc2ff16aa57b 100644 (file)
--- 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>',