Prep for new release

git-svn-id: https://nagios.svn.sourceforge.net/svnroot/nagios/nagioscore/trunk@1175 5f96b256-904b-4d8d-8c98-d829582c6739
hedenface · Apr 1, 2008 · 2e1ab6a · 2e1ab6a
1 parent ce58044
commit 2e1ab6a
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 18 deletions.
diff --git a/Changelog b/Changelog
@@ -3,9 +3,10 @@ Nagios 3.x Change Log
 #####################
 
 
-3.0.1 - ??/??/2008
+3.0.1 - 04/01/2008
 -------------------
 * Fixed bug in trends CGI with user not being authorized for hosts/services
+* Fixed bug in status CGI with page layout messing up when sounds enabled
 
 
 

diff --git a/THANKS b/THANKS
@@ -114,6 +114,7 @@ since 1999.  If I missed your name, let me know.
 * David Kmoch
 * Brandon Knitter
 * Ryoji Kobayashi
+* Uwe Knop
 * Daniel Koffler
 * Chris Kolquist
 * Jiri Kostern

diff --git a/base/nagios.c b/base/nagios.c
@@ -3,12 +3,12 @@
  * NAGIOS.C - Core Program Code For Nagios
  *
  * Program: Nagios
- * Version: 3.0
+ * Version: 3.0.1
  * License: GPL
  * Copyright (c) 1999-2007 Ethan Galstad (http://www.nagios.org)
  *
  * First Written:   01-28-1999 (start of development)
- * Last Modified:   03-13-2008
+ * Last Modified:   04-01-2008
  *
  * Description:
  *

diff --git a/base/nagiostats.c b/base/nagiostats.c
@@ -3,11 +3,11 @@
  * NAGIOSTATS.C - Displays Nagios Statistics
  *
  * Program: Nagiostats
- * Version: 3.0
+ * Version: 3.0.1
  * License: GPL
  * Copyright (c) 2003-2008 Ethan Galstad ([email protected])
  *
- * Last Modified:   03-13-2008
+ * Last Modified:   04-01-2008
  *
  * License:
  *

diff --git a/cgi/status.c b/cgi/status.c
@@ -3,7 +3,7 @@
  * STATUS.C -  Nagios Status CGI
  *
  * Copyright (c) 1999-2008 Ethan Galstad ([email protected])
- * Last Modified: 01-08-2008
+ * Last Modified: 04-01-2008
  *
  * License:
  * 
@@ -438,7 +438,7 @@ int main(void){
 	else if(problem_services_unknown==0 && problem_services_warning==0 && problem_services_critical==0 && problem_hosts_down==0 && problem_hosts_unreachable==0 && normal_sound!=NULL)
 		sound=normal_sound;
 	if(sound!=NULL){
-		printf("<object type=\"application/wav\" data=\"%s%s\" height=\"-\" width=\"0\">",url_media_path,sound);
+		printf("<object type=\"application/wav\" data=\"%s%s\" height=\"0\" width=\"0\">",url_media_path,sound);
 		printf("<param name=\"filename\" value=\"%s%s\">",url_media_path,sound);
 		printf("<param name=\"autostart\" value=\"1\">");
 		printf("<param name=\"playcount\" value=\"1\">");

diff --git a/configure b/configure
@@ -1307,9 +1307,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 PKG_NAME=nagios
-PKG_VERSION="3.0"
+PKG_VERSION="3.0.1"
 PKG_HOME_URL="http://www.nagios.org/"
-PKG_REL_DATE="03-13-2008"
+PKG_REL_DATE="04-01-2008"
 
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do

diff --git a/configure.in b/configure.in
@@ -9,9 +9,9 @@ AC_CONFIG_HEADER(include/config.h include/snprintf.h include/cgiutils.h)
 AC_PREFIX_DEFAULT(/usr/local/nagios)
 
 PKG_NAME=nagios
-PKG_VERSION="3.0"
+PKG_VERSION="3.0.1"
 PKG_HOME_URL="http://www.nagios.org/"
-PKG_REL_DATE="03-13-2008"
+PKG_REL_DATE="04-01-2008"
 
 dnl Figure out how to invoke "install" and what install options to use.
 AC_PROG_INSTALL

diff --git a/html/main.html b/html/main.html
@@ -40,8 +40,8 @@
 </div>    </td>
     <td>
     <div>
-<div align=center CLASS="version">Version 3.0</div>
-<div align=center CLASS="releaseDate">March 13, 2008</div>
+<div align=center CLASS="version">Version 3.0.1</div>
+<div align=center CLASS="releaseDate">April 01, 2008</div>
 <div align=center CLASS="whatsNew"><a href="docs/whatsnew.html">Read what's new in Nagios 3</a></div>
 </div>    </td>
   </tr>

diff --git a/include/common.h b/include/common.h
@@ -21,8 +21,8 @@
  ************************************************************************/
 
 
-#define PROGRAM_VERSION "3.0"
-#define PROGRAM_MODIFICATION_DATE "03-13-2008"
+#define PROGRAM_VERSION "3.0.1"
+#define PROGRAM_MODIFICATION_DATE "04-01-2008"
 
 /*#define DEBUG_CHECK_IPC 1 */
 /*#define DEBUG_CHECK_IPC2 1*/

diff --git a/nagios.spec b/nagios.spec
@@ -1,5 +1,5 @@
 %define name nagios
-%define version 3.0
+%define version 3.0.1
 %define release 1.fc4.test
 %define nsusr nagios
 %define nsgrp nagios

diff --git a/update-version b/update-version
@@ -10,10 +10,10 @@ else
 fi
 
 # Current version number
-CURRENTVERSION=3.0
+CURRENTVERSION=3.0.1
 
 # Last date
-LASTDATE=03-13-2008
+LASTDATE=04-01-2008
 
 if [ "x$1" = "x" ]
 then