[icinga-checkins] icinga.org: icinga-core/test/core: flag r1.6 as 1.6.0 again

git at icinga.org git at icinga.org
Tue Nov 15 18:57:40 CET 2011


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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu Nov 10 13:50:42 2011 +0100

flag r1.6 as 1.6.0 again

---

 Makefile.in                      |    2 +-
 base/icinga.c                    |    2 +-
 base/icingastats.c               |    2 +-
 configure                        |    2 +-
 configure.in                     |    2 +-
 docbook                          |    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 +-
 15 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 3b2669a..7b31f64 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -78,7 +78,7 @@ MKDIR=/bin/mkdir
 ###############################
 # Global
 ###############################
-ICINGA_VERSION=1.6.0-dev
+ICINGA_VERSION=1.6.0
 
 CP=@CP@
 
diff --git a/base/icinga.c b/base/icinga.c
index dee3836..6158622 100644
--- a/base/icinga.c
+++ b/base/icinga.c
@@ -3,7 +3,7 @@
  * ICINGA.C - Core Program Code For Icinga
  *
  * Program: Icinga
- * Version: 1.6.0-dev
+ * Version: 1.6.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 7a6a0bf..20a07a5 100644
--- a/base/icingastats.c
+++ b/base/icingastats.c
@@ -3,7 +3,7 @@
  * ICINGASTATS.C - Displays Icinga Statistics
  *
  * Program: Icingastats
- * Version: 1.6.0-dev
+ * Version: 1.6.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 ee6986b..b1e64b2 100755
--- a/configure
+++ b/configure
@@ -2423,7 +2423,7 @@ ac_config_headers="$ac_config_headers include/config.h include/snprintf.h"
 
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.6.0-dev"
+PKG_VERSION="1.6.0"
 PKG_HOME_URL="http://www.icinga.org/"
 PKG_REL_DATE="11-30-2011"
 
diff --git a/configure.in b/configure.in
index 34a478e..b60e22f 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.6.0-dev"
+PKG_VERSION="1.6.0"
 PKG_HOME_URL="http://www.icinga.org/"
 PKG_REL_DATE="11-30-2011"
 
diff --git a/docbook b/docbook
index aad3998..f70b321 160000
--- a/docbook
+++ b/docbook
@@ -1 +1 @@
-Subproject commit aad3998a7428b22ce412634184c11e7c9478050d
+Subproject commit f70b321a3d5ffe89fa403d5b5cb2c93479f75401
diff --git a/html/main.html b/html/main.html
index da4e73e..a36d04b 100644
--- a/html/main.html
+++ b/html/main.html
@@ -18,9 +18,9 @@
 </div>
 
 <div id="currentversioninfo">
-<div class="version">Version 1.6.0-dev</div>
+<div class="version">Version 1.6.0</div>
 <div class="releasedate">November 30, 2011</div>
-<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.6.0-dev</a></div>
+<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.6.0</a></div>
 </div>
 
 <div id="developer">
diff --git a/icinga.spec b/icinga.spec
index 592a4b7..a230056 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -14,7 +14,7 @@
 
 Summary: Open Source host, service and network monitoring program
 Name: icinga
-Version: 1.6.0-dev
+Version: 1.6.0
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
diff --git a/include/common.h b/include/common.h
index 631d068..eadd786 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.6.0-dev"
+#define PROGRAM_VERSION "1.6.0"
 #define PROGRAM_MODIFICATION_DATE "11-30-2011"
 
 /*#define DEBUG_CHECK_IPC 1 */
diff --git a/module/idoutils/include/ido2db.h b/module/idoutils/include/ido2db.h
index 66113f0..b5f4f5d 100644
--- a/module/idoutils/include/ido2db.h
+++ b/module/idoutils/include/ido2db.h
@@ -14,7 +14,7 @@
 
 #define IDO2DB_NAME "IDO2DB"
 #define IDO2DB_DATE "11-30-2011"
-#define IDO2DB_VERSION "1.6.0-dev"
+#define IDO2DB_VERSION "1.6.0"
 
 #define IDO2DB_SCHEMA_VERSION "1.6.0"
 
diff --git a/module/idoutils/include/idomod.h b/module/idoutils/include/idomod.h
index b994832..f87b0ec 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.6.0-dev"
+#define IDOMOD_VERSION "1.6.0"
 #define IDOMOD_NAME "IDOMOD"
 #define IDOMOD_DATE "11-30-2011"
 
diff --git a/module/idoutils/src/file2sock.c b/module/idoutils/src/file2sock.c
index 725bcd1..8cc6c7c 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.6.0-dev"
+#define FILE2SOCK_VERSION "1.6.0"
 #define FILE2SOCK_NAME "FILE2SOCK"
 #define FILE2SOCK_DATE "11-30-2011"
 
diff --git a/module/idoutils/src/log2ido.c b/module/idoutils/src/log2ido.c
index d26df48..b4a20eb 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.6.0-dev"
+#define LOG2IDO_VERSION "1.6.0"
 #define LOG2IDO_NAME "LOG2IDO"
 #define LOG2IDO_DATE "11-30-2011"
 
diff --git a/module/idoutils/src/sockdebug.c b/module/idoutils/src/sockdebug.c
index 81d536b..44dcfd6 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.6.0-dev"
+#define SOCKDEBUG_VERSION "1.6.0"
 #define SOCKDEBUG_NAME "SOCKDEBUG"
 #define SOCKDEBUG_DATE "11-30-2011"
 
diff --git a/update-version b/update-version
index 38dbb7f..4ab5117 100755
--- a/update-version
+++ b/update-version
@@ -10,7 +10,7 @@ else
 fi
 
 # Current version number
-CURRENTVERSION=1.6.0-dev
+CURRENTVERSION=1.6.0
 
 # Last date
 LASTDATE=11-30-2011





More information about the icinga-checkins mailing list