[icinga-checkins] icinga.org: icinga-core/master: flag master as 1.6.0-dev again

git at icinga.org git at icinga.org
Mon Nov 14 17:36:00 CET 2011


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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Nov 14 17:35:47 2011 +0100

flag master as 1.6.0-dev again

---

 Makefile.in                      |    2 +-
 configure                        |    2 +-
 configure.in                     |    2 +-
 docbook                          |    2 +-
 html/main.html                   |    4 ++--
 icinga.spec                      |    2 +-
 include/common.h                 |    2 +-
 module/idoutils/include/common.h |    2 +-
 update-version                   |    2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 7b31f64..3b2669a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -78,7 +78,7 @@ MKDIR=/bin/mkdir
 ###############################
 # Global
 ###############################
-ICINGA_VERSION=1.6.0
+ICINGA_VERSION=1.6.0-dev
 
 CP=@CP@
 
diff --git a/configure b/configure
index b1e64b2..ee6986b 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"
+PKG_VERSION="1.6.0-dev"
 PKG_HOME_URL="http://www.icinga.org/"
 PKG_REL_DATE="11-30-2011"
 
diff --git a/configure.in b/configure.in
index b60e22f..34a478e 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"
+PKG_VERSION="1.6.0-dev"
 PKG_HOME_URL="http://www.icinga.org/"
 PKG_REL_DATE="11-30-2011"
 
diff --git a/docbook b/docbook
index f70b321..aad3998 160000
--- a/docbook
+++ b/docbook
@@ -1 +1 @@
-Subproject commit f70b321a3d5ffe89fa403d5b5cb2c93479f75401
+Subproject commit aad3998a7428b22ce412634184c11e7c9478050d
diff --git a/html/main.html b/html/main.html
index a36d04b..da4e73e 100644
--- a/html/main.html
+++ b/html/main.html
@@ -18,9 +18,9 @@
 </div>
 
 <div id="currentversioninfo">
-<div class="version">Version 1.6.0</div>
+<div class="version">Version 1.6.0-dev</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</a></div>
+<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.6.0-dev</a></div>
 </div>
 
 <div id="developer">
diff --git a/icinga.spec b/icinga.spec
index a230056..592a4b7 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
+Version: 1.6.0-dev
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/System
diff --git a/include/common.h b/include/common.h
index eadd786..631d068 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"
+#define PROGRAM_VERSION "1.6.0-dev"
 #define PROGRAM_MODIFICATION_DATE "11-30-2011"
 
 /*#define DEBUG_CHECK_IPC 1 */
diff --git a/module/idoutils/include/common.h b/module/idoutils/include/common.h
index 03aff64..f321f32 100644
--- a/module/idoutils/include/common.h
+++ b/module/idoutils/include/common.h
@@ -23,7 +23,7 @@
 
 /* only one space for update-version matching */
 #define IDO_DATE "11-30-2011"
-#define IDO_VERSION "1.6.0"
+#define IDO_VERSION "1.6.0-dev"
 
 #define IDO_SCHEMA_VERSION "1.6.0"
 
diff --git a/update-version b/update-version
index 605583e..04951d9 100755
--- a/update-version
+++ b/update-version
@@ -10,7 +10,7 @@ else
 fi
 
 # Current version number
-CURRENTVERSION=1.6.0
+CURRENTVERSION=1.6.0-dev
 
 # Last date
 LASTDATE=11-30-2011





More information about the icinga-checkins mailing list