[icinga-checkins] icinga.org: icinga-core/test/core: set master to next major version 1.5

git at icinga.org git at icinga.org
Sat Jun 4 17:03:02 CEST 2011


Module: icinga-core
Branch: test/core
Commit: 4590e2c8c7a3e8126cf0a00c9d1243255caa2511
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=4590e2c8c7a3e8126cf0a00c9d1243255caa2511

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed May 11 19:37:12 2011 +0200

set master to next major version 1.5

---

 Makefile.in                             |    2 +-
 base/icinga.c                           |    2 +-
 base/icingastats.c                      |    2 +-
 configure                               |    4 ++--
 configure.in                            |    4 ++--
 html/main.html                          |    6 +++---
 icinga.spec                             |    2 +-
 include/common.h                        |    4 ++--
 module/idoutils/db/mysql/mysql.sql      |    2 +-
 module/idoutils/db/oracle/oracle.sql    |    2 +-
 module/idoutils/db/pgsql/pgsql.sql      |    2 +-
 module/idoutils/db/scripts/installdb.in |    2 +-
 module/idoutils/db/scripts/upgradedb.in |    6 +++---
 module/idoutils/include/ido2db.h        |    4 ++--
 module/idoutils/include/idomod.h        |    4 ++--
 module/idoutils/src/file2sock.c         |    4 ++--
 module/idoutils/src/log2ido.c           |    4 ++--
 module/idoutils/src/sockdebug.c         |    4 ++--
 update-version                          |    6 +++---
 19 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index fa80e6a..c17865f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -75,7 +75,7 @@ MKDIR=/bin/mkdir
 ###############################
 # Global
 ###############################
-ICINGA_VERSION=1.4.0
+ICINGA_VERSION=1.5.0
 
 CP=@CP@
 
diff --git a/base/icinga.c b/base/icinga.c
index 45fb1c8..ecb8f0e 100644
--- a/base/icinga.c
+++ b/base/icinga.c
@@ -3,7 +3,7 @@
  * ICINGA.C - Core Program Code For Icinga
  *
  * Program: Icinga
- * Version: 1.4.0
+ * Version: 1.5.0
  * License: GPL
  * Copyright (c) 1999-2009 Ethan Galstad (http://www.nagios.org)
  * Copyright (c) 2009-2011 Nagios Core Development Team and Community Contributors
diff --git a/base/icingastats.c b/base/icingastats.c
index 899fbde..516abab 100644
--- a/base/icingastats.c
+++ b/base/icingastats.c
@@ -3,7 +3,7 @@
  * ICINGASTATS.C - Displays Icinga Statistics
  *
  * Program: Icingastats
- * Version: 1.4.0
+ * Version: 1.5.0
  * License: GPL
  * Copyright (c) 2003-2008 Ethan Galstad (egalstad at nagios.org)
  * Copyright (c) 2009-2011 Nagios Core Development Team and Community Contributors
diff --git a/configure b/configure
index 2e07d18..4fcb82e 100755
--- a/configure
+++ b/configure
@@ -2399,9 +2399,9 @@ ac_config_headers="$ac_config_headers include/config.h include/snprintf.h"
 
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.4.0"
+PKG_VERSION="1.5.0"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="05-11-2011"
+PKG_REL_DATE="08-17-2011"
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
diff --git a/configure.in b/configure.in
index a1f6f6c..482ac98 100644
--- a/configure.in
+++ b/configure.in
@@ -9,9 +9,9 @@ AC_CONFIG_HEADER(include/config.h include/snprintf.h)
 AC_PREFIX_DEFAULT(/usr/local/icinga)
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.4.0"
+PKG_VERSION="1.5.0"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="05-11-2011"
+PKG_REL_DATE="08-17-2011"
 
 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
index f65a9b4..be5a3a5 100644
--- a/html/main.html
+++ b/html/main.html
@@ -18,9 +18,9 @@
 </div>
 
 <div id="currentversioninfo">
-<div class="version">Version 1.4.0</div>
-<div class="releasedate">May 11, 2011</div>
-<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.4.0</a></div>
+<div class="version">Version 1.5.0</div>
+<div class="releasedate">August 17, 2011</div>
+<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.5.0</a></div>
 </div>
 
 <div id="developer">
diff --git a/icinga.spec b/icinga.spec
index 9f8fc09..d2a9d83 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -11,7 +11,7 @@
 
 Summary: Open Source host, service and network monitoring program
 Name: icinga
-Version: 1.4.0
+Version: 1.5.0
 Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
diff --git a/include/common.h b/include/common.h
index 4042fa9..bb35616 100644
--- a/include/common.h
+++ b/include/common.h
@@ -27,8 +27,8 @@
 #define PROGRAM_NAME "Icinga"
 #define PROGRAM_NAME_UC "ICINGA"
 #define PROGRAM_NAME_LC "icinga"
-#define PROGRAM_VERSION "1.4.0"
-#define PROGRAM_MODIFICATION_DATE "05-11-2011"
+#define PROGRAM_VERSION "1.5.0"
+#define PROGRAM_MODIFICATION_DATE "08-17-2011"
 
 /*#define DEBUG_CHECK_IPC 1 */
 /*#define DEBUG_CHECK_IPC2 1*/
diff --git a/module/idoutils/db/mysql/mysql.sql b/module/idoutils/db/mysql/mysql.sql
index baa98e9..aa4b717 100644
--- a/module/idoutils/db/mysql/mysql.sql
+++ b/module/idoutils/db/mysql/mysql.sql
@@ -1555,6 +1555,6 @@ CREATE INDEX statehist_i_id_o_id_s_ty_s_ti on icinga_statehistory(instance_id, o
 -- -----------------------------------------
 -- set dbversion
 -- -----------------------------------------
-INSERT INTO icinga_dbversion (name, version) VALUES ('idoutils', '1.4.0') ON DUPLICATE KEY UPDATE version='1.4.0';
+INSERT INTO icinga_dbversion (name, version) VALUES ('idoutils', '1.5.0') ON DUPLICATE KEY UPDATE version='1.5.0';
 
 
diff --git a/module/idoutils/db/oracle/oracle.sql b/module/idoutils/db/oracle/oracle.sql
index 772100d..36d6afe 100644
--- a/module/idoutils/db/oracle/oracle.sql
+++ b/module/idoutils/db/oracle/oracle.sql
@@ -21,7 +21,7 @@
 -- -- --------------------------------------------------------
 */
 
-DEFINE ICINGA_VERSION=1.4.0
+DEFINE ICINGA_VERSION=1.5.0
 
 -- -----------------------------------------
 -- set defines
diff --git a/module/idoutils/db/pgsql/pgsql.sql b/module/idoutils/db/pgsql/pgsql.sql
index 5b1b40a..4fba3cd 100644
--- a/module/idoutils/db/pgsql/pgsql.sql
+++ b/module/idoutils/db/pgsql/pgsql.sql
@@ -1588,5 +1588,5 @@ CREATE INDEX statehist_i_id_o_id_s_ty_s_ti on icinga_statehistory(instance_id, o
 -- set dbversion

 -- -----------------------------------------

 

-SELECT updatedbversion('1.4.0');

+SELECT updatedbversion('1.5.0');

 

diff --git a/module/idoutils/db/scripts/installdb.in b/module/idoutils/db/scripts/installdb.in
index 51cef88..cf5d1c8 100755
--- a/module/idoutils/db/scripts/installdb.in
+++ b/module/idoutils/db/scripts/installdb.in
@@ -45,7 +45,7 @@ my $dbh = DBI->connect("DBI:mysql:database=$database;host=$hostname",
 		or die "Cannot connect to database";
 
 # Current database version
-my $thisversion="1.4.0";
+my $thisversion="1.5.0";
 
 # Create version table if it doesn't exist
 eval { $dbh->do("SELECT * FROM icinga_dbversion LIMIT 1") };
diff --git a/module/idoutils/db/scripts/upgradedb.in b/module/idoutils/db/scripts/upgradedb.in
index fc8fd88..25e6e13 100755
--- a/module/idoutils/db/scripts/upgradedb.in
+++ b/module/idoutils/db/scripts/upgradedb.in
@@ -53,9 +53,9 @@ if ($@) {
 
 # Get current database version
 my $version;
-my $thisversion="1.4.0";
-my $lastversion="1.4.0";
-my $legacyversion="1.4.0";
+my $thisversion="1.5.0";
+my $lastversion="1.5.0";
+my $legacyversion="1.5.0";
 
 $version = $dbh->selectrow_array("SELECT version FROM icinga_dbversion WHERE name='idoutils'");
 if ($version eq "") {
diff --git a/module/idoutils/include/ido2db.h b/module/idoutils/include/ido2db.h
index 3dea98d..fa84824 100644
--- a/module/idoutils/include/ido2db.h
+++ b/module/idoutils/include/ido2db.h
@@ -13,8 +13,8 @@
 #include "utils.h"
 
 #define IDO2DB_NAME "IDO2DB"
-#define IDO2DB_DATE "05-11-2011"
-#define IDO2DB_VERSION "1.4.0"
+#define IDO2DB_DATE "08-17-2011"
+#define IDO2DB_VERSION "1.5.0"
 
 #define IDO2DB_SCHEMA_VERSION "1.4.0"
 
diff --git a/module/idoutils/include/idomod.h b/module/idoutils/include/idomod.h
index 6d09ef9..7b5db44 100644
--- a/module/idoutils/include/idomod.h
+++ b/module/idoutils/include/idomod.h
@@ -9,9 +9,9 @@
 #ifndef _NDBXT_IDOMOD_H
 #define _NDBXT_IDOMOD_H
 
-#define IDOMOD_VERSION "1.4.0"
+#define IDOMOD_VERSION "1.5.0"
 #define IDOMOD_NAME "IDOMOD"
-#define IDOMOD_DATE "05-11-2011"
+#define IDOMOD_DATE "08-17-2011"
 
 /************** misc definitions *************/
 
diff --git a/module/idoutils/src/file2sock.c b/module/idoutils/src/file2sock.c
index 782d44f..32f5e5e 100644
--- a/module/idoutils/src/file2sock.c
+++ b/module/idoutils/src/file2sock.c
@@ -12,9 +12,9 @@
 #include "../include/common.h"
 #include "../include/io.h"
 
-#define FILE2SOCK_VERSION "1.4.0"
+#define FILE2SOCK_VERSION "1.5.0"
 #define FILE2SOCK_NAME "FILE2SOCK"
-#define FILE2SOCK_DATE "05-11-2011"
+#define FILE2SOCK_DATE "08-17-2011"
 
 
 int process_arguments(int,char **);
diff --git a/module/idoutils/src/log2ido.c b/module/idoutils/src/log2ido.c
index 120d1b7..07a55b9 100644
--- a/module/idoutils/src/log2ido.c
+++ b/module/idoutils/src/log2ido.c
@@ -11,9 +11,9 @@
 #include "../include/io.h"
 #include "../include/protoapi.h"
 
-#define LOG2IDO_VERSION "1.4.0"
+#define LOG2IDO_VERSION "1.5.0"
 #define LOG2IDO_NAME "LOG2IDO"
-#define LOG2IDO_DATE "05-11-2011"
+#define LOG2IDO_DATE "08-17-2011"
 
 
 
diff --git a/module/idoutils/src/sockdebug.c b/module/idoutils/src/sockdebug.c
index 2db11c6..936a4b6 100644
--- a/module/idoutils/src/sockdebug.c
+++ b/module/idoutils/src/sockdebug.c
@@ -9,9 +9,9 @@
 #include "../../../include/config.h"
 #include "../include/io.h"
 
-#define SOCKDEBUG_VERSION "1.4.0"
+#define SOCKDEBUG_VERSION "1.5.0"
 #define SOCKDEBUG_NAME "SOCKDEBUG"
-#define SOCKDEBUG_DATE "05-11-2011"
+#define SOCKDEBUG_DATE "08-17-2011"
 
 
 int cleanup_socket(int,char *);
diff --git a/update-version b/update-version
index 93a7a25..4e31c1d 100755
--- a/update-version
+++ b/update-version
@@ -10,10 +10,10 @@ else
 fi
 
 # Current version number
-CURRENTVERSION=1.4.0
+CURRENTVERSION=1.5.0
 
 # Last date
-LASTDATE=05-11-2011
+LASTDATE=08-17-2011
 
 if [ "x$1" = "x" ]
 then
@@ -45,7 +45,7 @@ fi
 perl -i -p -e "s/Version: .*/Version: $newversion/;" icinga.spec
 
 # Update version number Doxyfile
-perl -i -p -e "s/PROJECT_NUMBER         = .*/PROJECT_NUMBER         = $newversion/;" Doxyfile
+#perl -i -p -e "s/PROJECT_NUMBER         = .*/PROJECT_NUMBER         = $newversion/;" Doxyfile
 
 # Update version number in Makefile.in
 perl -i -p -e "s/ICINGA_VERSION=.*/ICINGA_VERSION=$newversion/;" Makefile.in





More information about the icinga-checkins mailing list