[icinga-checkins] icinga.org: icinga-core/mfriedrich/core: prepare next for 1.8.0dev

git at icinga.org git at icinga.org
Thu Jun 21 10:00:26 CEST 2012


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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu Jun 21 09:59:15 2012 +0200

prepare next for 1.8.0dev

---

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

diff --git a/Makefile.in b/Makefile.in
index 870d2f7..b1d88a5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -78,7 +78,7 @@ MKDIR=/bin/mkdir
 ###############################
 # Global
 ###############################
-ICINGA_VERSION=1.7.1
+ICINGA_VERSION=1.8.0dev
 
 CP=@CP@
 
diff --git a/configure b/configure
index b9d439a..e54fa43 100755
--- a/configure
+++ b/configure
@@ -2453,9 +2453,9 @@ ac_config_headers="$ac_config_headers include/config.h"
 
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.7.1"
+PKG_VERSION="1.8.0dev"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="06-18-2012"
+PKG_REL_DATE="10-17-2012"
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
diff --git a/configure.in b/configure.in
index 8edf209..ed5904b 100644
--- a/configure.in
+++ b/configure.in
@@ -9,9 +9,9 @@ AC_CONFIG_HEADER(include/config.h)
 AC_PREFIX_DEFAULT(/usr/local/icinga)
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.7.1"
+PKG_VERSION="1.8.0dev"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="06-18-2012"
+PKG_REL_DATE="10-17-2012"
 
 dnl Figure out how to invoke "install" and what install options to use.
 AC_PROG_INSTALL
diff --git a/docbook b/docbook
index 619a08c..8a79d4c 160000
--- a/docbook
+++ b/docbook
@@ -1 +1 @@
-Subproject commit 619a08ca1178144b8a3a5caafff32a2d3918edab
+Subproject commit 8a79d4cbf77865a783c8bee04cab7517619737c7
diff --git a/html/main.html b/html/main.html
index 937b976..2f7acf4 100644
--- a/html/main.html
+++ b/html/main.html
@@ -18,9 +18,9 @@
 </div>
 
 <div id="currentversioninfo">
-<div class="version">Version 1.7.1</div>
-<div class="releasedate">June 18, 2012</div>
-<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.7.1</a></div>
+<div class="version">Version 1.8.0dev</div>
+<div class="releasedate">October 17, 2012</div>
+<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.8.0dev</a></div>
 </div>
 
 <div id="developer">
diff --git a/icinga.spec b/icinga.spec
index 858c940..2336d0f 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -20,7 +20,7 @@
 
 Summary: Open Source host, service and network monitoring program
 Name: icinga
-Version: 1.7.1
+Version: 1.8.0dev
 Release: %{revision}%{?dist}
 License: GPLv2
 Group: Applications/System
diff --git a/include/common.h b/include/common.h
index eae8ef2..03238a1 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.7.1"
-#define PROGRAM_MODIFICATION_DATE "06-18-2012"
+#define PROGRAM_VERSION "1.8.0dev"
+#define PROGRAM_MODIFICATION_DATE "10-17-2012"
 
 /*#define DEBUG_CHECK_IPC 1 */
 /*#define DEBUG_CHECK_IPC2 1*/
diff --git a/module/idoutils/include/common.h b/module/idoutils/include/common.h
index 8fabc4b..dfaaf83 100644
--- a/module/idoutils/include/common.h
+++ b/module/idoutils/include/common.h
@@ -22,8 +22,8 @@
 #define LOG2IDO_NAME 		"LOG2IDO"
 
 /* only one space for update-version matching */
-#define IDO_DATE "06-18-2012"
-#define IDO_VERSION "1.7.1"
+#define IDO_DATE "10-17-2012"
+#define IDO_VERSION "1.8.0dev"
 
 #define IDO_SCHEMA_VERSION "1.7.0"
 
diff --git a/update-version b/update-version
index ba3d9ac..1883754 100755
--- a/update-version
+++ b/update-version
@@ -10,10 +10,10 @@ else
 fi
 
 # Current version number
-CURRENTVERSION=1.7.1
+CURRENTVERSION=1.8.0dev
 
 # Last date
-LASTDATE=06-18-2012
+LASTDATE=10-17-2012
 
 if [ "x$1" = "x" ]
 then





More information about the icinga-checkins mailing list