[icinga-checkins] icinga.org: icinga-core/mfriedrich/core: mark the release branch as target 1.5.0

git at icinga.org git at icinga.org
Tue Jul 12 08:51:53 CEST 2011


Module: icinga-core
Branch: mfriedrich/core
Commit: 0b7d13a4c622c308aba5a241893e85a6d50ad997
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=0b7d13a4c622c308aba5a241893e85a6d50ad997

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Jul 11 21:11:59 2011 +0200

mark the release branch as target 1.5.0

---

 Makefile.in                      |    2 +-
 base/icinga.c                    |    2 +-
 base/icingastats.c               |    2 +-
 configure                        |    2 +-
 configure.in                     |    2 +-
 html/main.html                   |    4 ++--
 icinga.spec                      |    2 +-
 include/common.h                 |    2 +-
 module/idoutils/include/ido2db.h |    2 +-
 module/idoutils/include/idomod.h |    2 +-
 module/idoutils/src/file2sock.c  |    2 +-
 module/idoutils/src/log2ido.c    |    2 +-
 module/idoutils/src/sockdebug.c  |    2 +-
 update-version                   |    2 +-
 14 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 46ffc3f..a57b07b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -76,7 +76,7 @@ MKDIR=/bin/mkdir
 ###############################
 # Global
 ###############################
-ICINGA_VERSION=1.5.0-dev
+ICINGA_VERSION=1.5.0
 
 CP=@CP@
 
diff --git a/base/icinga.c b/base/icinga.c
index 40cd137..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.5.0-dev
+ * 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 94a4e2d..516abab 100644
--- a/base/icingastats.c
+++ b/base/icingastats.c
@@ -3,7 +3,7 @@
  * ICINGASTATS.C - Displays Icinga Statistics
  *
  * Program: Icingastats
- * Version: 1.5.0-dev
+ * 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 d9daee2..a49bad2 100755
--- a/configure
+++ b/configure
@@ -2403,7 +2403,7 @@ ac_config_headers="$ac_config_headers include/config.h include/snprintf.h"
 
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.5.0-dev"
+PKG_VERSION="1.5.0"
 PKG_HOME_URL="http://www.icinga.org/"
 PKG_REL_DATE="08-17-2011"
 
diff --git a/configure.in b/configure.in
index d52fc70..73abb86 100644
--- a/configure.in
+++ b/configure.in
@@ -9,7 +9,7 @@ AC_CONFIG_HEADER(include/config.h include/snprintf.h)
 AC_PREFIX_DEFAULT(/usr/local/icinga)
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.5.0-dev"
+PKG_VERSION="1.5.0"
 PKG_HOME_URL="http://www.icinga.org/"
 PKG_REL_DATE="08-17-2011"
 
diff --git a/html/main.html b/html/main.html
index 0e385c4..be5a3a5 100644
--- a/html/main.html
+++ b/html/main.html
@@ -18,9 +18,9 @@
 </div>
 
 <div id="currentversioninfo">
-<div class="version">Version 1.5.0-dev</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-dev</a></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 19a38c2..784c65e 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -5,7 +5,7 @@
 
 Summary: Open Source host, service and network monitoring program
 Name: icinga
-Version: 1.5.0-dev
+Version: 1.5.0
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
diff --git a/include/common.h b/include/common.h
index 598f871..bb35616 100644
--- a/include/common.h
+++ b/include/common.h
@@ -27,7 +27,7 @@
 #define PROGRAM_NAME "Icinga"
 #define PROGRAM_NAME_UC "ICINGA"
 #define PROGRAM_NAME_LC "icinga"
-#define PROGRAM_VERSION "1.5.0-dev"
+#define PROGRAM_VERSION "1.5.0"
 #define PROGRAM_MODIFICATION_DATE "08-17-2011"
 
 /*#define DEBUG_CHECK_IPC 1 */
diff --git a/module/idoutils/include/ido2db.h b/module/idoutils/include/ido2db.h
index fe6a77b..2c6ffe4 100644
--- a/module/idoutils/include/ido2db.h
+++ b/module/idoutils/include/ido2db.h
@@ -14,7 +14,7 @@
 
 #define IDO2DB_NAME "IDO2DB"
 #define IDO2DB_DATE "08-17-2011"
-#define IDO2DB_VERSION "1.5.0-dev"
+#define IDO2DB_VERSION "1.5.0"
 
 #define IDO2DB_SCHEMA_VERSION "1.5.0"
 
diff --git a/module/idoutils/include/idomod.h b/module/idoutils/include/idomod.h
index c7fadab..7b5db44 100644
--- a/module/idoutils/include/idomod.h
+++ b/module/idoutils/include/idomod.h
@@ -9,7 +9,7 @@
 #ifndef _NDBXT_IDOMOD_H
 #define _NDBXT_IDOMOD_H
 
-#define IDOMOD_VERSION "1.5.0-dev"
+#define IDOMOD_VERSION "1.5.0"
 #define IDOMOD_NAME "IDOMOD"
 #define IDOMOD_DATE "08-17-2011"
 
diff --git a/module/idoutils/src/file2sock.c b/module/idoutils/src/file2sock.c
index 10d4f0f..32f5e5e 100644
--- a/module/idoutils/src/file2sock.c
+++ b/module/idoutils/src/file2sock.c
@@ -12,7 +12,7 @@
 #include "../include/common.h"
 #include "../include/io.h"
 
-#define FILE2SOCK_VERSION "1.5.0-dev"
+#define FILE2SOCK_VERSION "1.5.0"
 #define FILE2SOCK_NAME "FILE2SOCK"
 #define FILE2SOCK_DATE "08-17-2011"
 
diff --git a/module/idoutils/src/log2ido.c b/module/idoutils/src/log2ido.c
index a22706c..07a55b9 100644
--- a/module/idoutils/src/log2ido.c
+++ b/module/idoutils/src/log2ido.c
@@ -11,7 +11,7 @@
 #include "../include/io.h"
 #include "../include/protoapi.h"
 
-#define LOG2IDO_VERSION "1.5.0-dev"
+#define LOG2IDO_VERSION "1.5.0"
 #define LOG2IDO_NAME "LOG2IDO"
 #define LOG2IDO_DATE "08-17-2011"
 
diff --git a/module/idoutils/src/sockdebug.c b/module/idoutils/src/sockdebug.c
index fd6bf24..936a4b6 100644
--- a/module/idoutils/src/sockdebug.c
+++ b/module/idoutils/src/sockdebug.c
@@ -9,7 +9,7 @@
 #include "../../../include/config.h"
 #include "../include/io.h"
 
-#define SOCKDEBUG_VERSION "1.5.0-dev"
+#define SOCKDEBUG_VERSION "1.5.0"
 #define SOCKDEBUG_NAME "SOCKDEBUG"
 #define SOCKDEBUG_DATE "08-17-2011"
 
diff --git a/update-version b/update-version
index 6688eb7..c5fb2c0 100755
--- a/update-version
+++ b/update-version
@@ -10,7 +10,7 @@ else
 fi
 
 # Current version number
-CURRENTVERSION=1.5.0-dev
+CURRENTVERSION=1.5.0
 
 # Last date
 LASTDATE=08-17-2011





More information about the icinga-checkins mailing list