[icinga-checkins] icinga.org: icinga-core/master: flag the git master as 1.5. 0-dev as of $today

git at icinga.org git at icinga.org
Tue Jul 12 20:08:09 CEST 2011


Module: icinga-core
Branch: master
Commit: 793b8d5b1324408abcf42b65efd7355795c8d93b
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=793b8d5b1324408abcf42b65efd7355795c8d93b

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Jul 12 20:07:51 2011 +0200

flag the git master as 1.5.0-dev as of $today

---

 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/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                   |    4 ++--
 update-version-schema            |    2 +-
 15 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 56ff3ac..aa52d6e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -78,7 +78,7 @@ MKDIR=/bin/mkdir
 ###############################
 # Global
 ###############################
-ICINGA_VERSION=1.5.0
+ICINGA_VERSION=1.5.0-dev
 
 CP=@CP@
 
diff --git a/base/icinga.c b/base/icinga.c
index ecb8f0e..40cd137 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
+ * Version: 1.5.0-dev
  * 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 516abab..94a4e2d 100644
--- a/base/icingastats.c
+++ b/base/icingastats.c
@@ -3,7 +3,7 @@
  * ICINGASTATS.C - Displays Icinga Statistics
  *
  * Program: Icingastats
- * Version: 1.5.0
+ * Version: 1.5.0-dev
  * 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 76f50ea..307068d 100755
--- a/configure
+++ b/configure
@@ -2421,9 +2421,9 @@ ac_config_headers="$ac_config_headers include/config.h include/snprintf.h"
 
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.5.0"
+PKG_VERSION="1.5.0-dev"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="08-17-2011"
+PKG_REL_DATE="07-12-2011"
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
diff --git a/configure.in b/configure.in
index 959198e..a9f873c 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.5.0"
+PKG_VERSION="1.5.0-dev"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="08-17-2011"
+PKG_REL_DATE="07-12-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 be5a3a5..014ea8d 100644
--- a/html/main.html
+++ b/html/main.html
@@ -18,9 +18,9 @@
 </div>
 
 <div id="currentversioninfo">
-<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 class="version">Version 1.5.0-dev</div>
+<div class="releasedate">July 12, 2011</div>
+<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.5.0-dev</a></div>
 </div>
 
 <div id="developer">
diff --git a/icinga.spec b/icinga.spec
index e74350e..b070015 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
+Version: 1.5.0-dev
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
diff --git a/include/common.h b/include/common.h
index bb35616..56d2b97 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.5.0"
-#define PROGRAM_MODIFICATION_DATE "08-17-2011"
+#define PROGRAM_VERSION "1.5.0-dev"
+#define PROGRAM_MODIFICATION_DATE "07-12-2011"
 
 /*#define DEBUG_CHECK_IPC 1 */
 /*#define DEBUG_CHECK_IPC2 1*/
diff --git a/module/idoutils/include/ido2db.h b/module/idoutils/include/ido2db.h
index 4e18335..6248938 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 "08-17-2011"
-#define IDO2DB_VERSION "1.5.0"
+#define IDO2DB_DATE "07-12-2011"
+#define IDO2DB_VERSION "1.5.0-dev"
 
 #define IDO2DB_SCHEMA_VERSION "1.5.0-dev"
 
diff --git a/module/idoutils/include/idomod.h b/module/idoutils/include/idomod.h
index 7b5db44..0c4ee6e 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.5.0"
+#define IDOMOD_VERSION "1.5.0-dev"
 #define IDOMOD_NAME "IDOMOD"
-#define IDOMOD_DATE "08-17-2011"
+#define IDOMOD_DATE "07-12-2011"
 
 /************** misc definitions *************/
 
diff --git a/module/idoutils/src/file2sock.c b/module/idoutils/src/file2sock.c
index 32f5e5e..88d643e 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.5.0"
+#define FILE2SOCK_VERSION "1.5.0-dev"
 #define FILE2SOCK_NAME "FILE2SOCK"
-#define FILE2SOCK_DATE "08-17-2011"
+#define FILE2SOCK_DATE "07-12-2011"
 
 
 int process_arguments(int,char **);
diff --git a/module/idoutils/src/log2ido.c b/module/idoutils/src/log2ido.c
index 07a55b9..8b8a590 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.5.0"
+#define LOG2IDO_VERSION "1.5.0-dev"
 #define LOG2IDO_NAME "LOG2IDO"
-#define LOG2IDO_DATE "08-17-2011"
+#define LOG2IDO_DATE "07-12-2011"
 
 
 
diff --git a/module/idoutils/src/sockdebug.c b/module/idoutils/src/sockdebug.c
index 936a4b6..c235781 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.5.0"
+#define SOCKDEBUG_VERSION "1.5.0-dev"
 #define SOCKDEBUG_NAME "SOCKDEBUG"
-#define SOCKDEBUG_DATE "08-17-2011"
+#define SOCKDEBUG_DATE "07-12-2011"
 
 
 int cleanup_socket(int,char *);
diff --git a/update-version b/update-version
index c5fb2c0..561d2bf 100755
--- a/update-version
+++ b/update-version
@@ -10,10 +10,10 @@ else
 fi
 
 # Current version number
-CURRENTVERSION=1.5.0
+CURRENTVERSION=1.5.0-dev
 
 # Last date
-LASTDATE=08-17-2011
+LASTDATE=07-12-2011
 
 if [ "x$1" = "x" ]
 then
diff --git a/update-version-schema b/update-version-schema
index 9489041..7550e35 100755
--- a/update-version-schema
+++ b/update-version-schema
@@ -13,7 +13,7 @@ fi
 CURRENTVERSION=1.5.0-dev
 
 # Last date
-LASTDATE=08-17-2011
+LASTDATE=07-12-2011
 
 if [ "x$1" = "x" ]
 then





More information about the icinga-checkins mailing list