[icinga-checkins] icinga.org: icinga-core/dev/core: target the release branch 1.7.0 ( do NOT use as merge source!)

git at icinga.org git at icinga.org
Thu Jun 21 09:59:57 CEST 2012


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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu Apr 19 22:41:50 2012 +0200

target the release branch 1.7.0 (do NOT use as merge source!)

---

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

diff --git a/Makefile.in b/Makefile.in
index 7fd3971..66399e1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -78,7 +78,7 @@ MKDIR=/bin/mkdir
 ###############################
 # Global
 ###############################
-ICINGA_VERSION=1.7.0-dev
+ICINGA_VERSION=1.7.0
 
 CP=@CP@
 
diff --git a/configure b/configure
index e065527..d89cc5f 100755
--- a/configure
+++ b/configure
@@ -2439,7 +2439,7 @@ ac_config_headers="$ac_config_headers include/config.h"
 
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.7.0-dev"
+PKG_VERSION="1.7.0"
 PKG_HOME_URL="http://www.icinga.org/"
 PKG_REL_DATE="05-15-2012"
 
diff --git a/configure.in b/configure.in
index d5f7bcd..f0687c7 100644
--- a/configure.in
+++ b/configure.in
@@ -9,7 +9,7 @@ AC_CONFIG_HEADER(include/config.h)
 AC_PREFIX_DEFAULT(/usr/local/icinga)
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.7.0-dev"
+PKG_VERSION="1.7.0"
 PKG_HOME_URL="http://www.icinga.org/"
 PKG_REL_DATE="05-15-2012"
 
diff --git a/html/main.html b/html/main.html
index 833b4b5..badbdfa 100644
--- a/html/main.html
+++ b/html/main.html
@@ -18,9 +18,9 @@
 </div>
 
 <div id="currentversioninfo">
-<div class="version">Version 1.7.0-dev</div>
+<div class="version">Version 1.7.0</div>
 <div class="releasedate">May 15, 2012</div>
-<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.7.0-dev</a></div>
+<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.7.0</a></div>
 </div>
 
 <div id="developer">
diff --git a/icinga.spec b/icinga.spec
index 296ef88..60811f0 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -19,7 +19,7 @@
 
 Summary: Open Source host, service and network monitoring program
 Name: icinga
-Version: 1.7.0-dev
+Version: 1.7.0
 Release: %{revision}%{?dist}
 License: GPLv2
 Group: Applications/System
diff --git a/include/common.h b/include/common.h
index dc1a67b..37dca59 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.7.0-dev"
+#define PROGRAM_VERSION "1.7.0"
 #define PROGRAM_MODIFICATION_DATE "05-15-2012"
 
 /*#define DEBUG_CHECK_IPC 1 */
diff --git a/module/idoutils/include/common.h b/module/idoutils/include/common.h
index a59aa0a..e10db64 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 "05-15-2012"
-#define IDO_VERSION "1.7.0-dev"
+#define IDO_VERSION "1.7.0"
 
 #define IDO_SCHEMA_VERSION "1.7.0"
 
diff --git a/update-version b/update-version
index 76466b7..a144d44 100755
--- a/update-version
+++ b/update-version
@@ -10,7 +10,7 @@ else
 fi
 
 # Current version number
-CURRENTVERSION=1.7.0-dev
+CURRENTVERSION=1.7.0
 
 # Last date
 LASTDATE=05-15-2012





More information about the icinga-checkins mailing list