[icinga-checkins] icinga.org: icinga-core/mfriedrich/core: correct version to -dev, and set release data

git at icinga.org git at icinga.org
Thu Apr 19 22:31:58 CEST 2012


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

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

correct version to -dev, and set release data

---

 Changelog                        |    2 +-
 Makefile.in                      |    2 +-
 configure                        |    4 ++--
 configure.in                     |    4 ++--
 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/Changelog b/Changelog
index b1a3652..5a08fa9 100644
--- a/Changelog
+++ b/Changelog
@@ -4,7 +4,7 @@ Icinga 1.7.x Change Log
 
 Thanks to all contributers, testers and developers. Please read AUTHORS and THANKS for a detailed list :-)
 
-1.7.0 - XX/YY/2012
+1.7.0 - 15/05/2012
 
 !!! ATTENTION !!!
 	idomod.o was renamed to idomod.so, module extension is now .so
diff --git a/Makefile.in b/Makefile.in
index 66399e1..7fd3971 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -78,7 +78,7 @@ MKDIR=/bin/mkdir
 ###############################
 # Global
 ###############################
-ICINGA_VERSION=1.7.0
+ICINGA_VERSION=1.7.0-dev
 
 CP=@CP@
 
diff --git a/configure b/configure
index 86f671b..e065527 100755
--- a/configure
+++ b/configure
@@ -2439,9 +2439,9 @@ ac_config_headers="$ac_config_headers include/config.h"
 
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.7.0"
+PKG_VERSION="1.7.0-dev"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="04-19-2012"
+PKG_REL_DATE="05-15-2012"
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
diff --git a/configure.in b/configure.in
index ad4bb65..d5f7bcd 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.0"
+PKG_VERSION="1.7.0-dev"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="04-19-2012"
+PKG_REL_DATE="05-15-2012"
 
 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 0db3b7d..833b4b5 100644
--- a/html/main.html
+++ b/html/main.html
@@ -18,9 +18,9 @@
 </div>
 
 <div id="currentversioninfo">
-<div class="version">Version 1.7.0</div>
-<div class="releasedate">April 19, 2012</div>
-<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.7.0</a></div>
+<div class="version">Version 1.7.0-dev</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>
 
 <div id="developer">
diff --git a/icinga.spec b/icinga.spec
index 60811f0..296ef88 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
+Version: 1.7.0-dev
 Release: %{revision}%{?dist}
 License: GPLv2
 Group: Applications/System
diff --git a/include/common.h b/include/common.h
index 052d63b..dc1a67b 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.0"
-#define PROGRAM_MODIFICATION_DATE "04-19-2012"
+#define PROGRAM_VERSION "1.7.0-dev"
+#define PROGRAM_MODIFICATION_DATE "05-15-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 65b062f..a59aa0a 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 "04-19-2012"
-#define IDO_VERSION "1.7.0"
+#define IDO_DATE "05-15-2012"
+#define IDO_VERSION "1.7.0-dev"
 
 #define IDO_SCHEMA_VERSION "1.7.0"
 
diff --git a/update-version b/update-version
index c9eb2e2..76466b7 100755
--- a/update-version
+++ b/update-version
@@ -10,10 +10,10 @@ else
 fi
 
 # Current version number
-CURRENTVERSION=1.7.0
+CURRENTVERSION=1.7.0-dev
 
 # Last date
-LASTDATE=04-19-2012
+LASTDATE=05-15-2012
 
 if [ "x$1" = "x" ]
 then





More information about the icinga-checkins mailing list