From b817487ce1717697ea8961c0ef455c0027a89077 Mon Sep 17 00:00:00 2001 From: ramonn Date: Thu, 21 Jun 2012 17:39:54 +0000 Subject: [PATCH] 2012-06-21 Ramon Novoa * DEBIAN/control, DEBIAN/make_deb_package.sh, conf/pandora_server.conf, pandora_server.spec, lib/PandoraFMS/Config.pm, pandora_server.redhat.spec, util/pandora_db.pl, util/pandora_manage.pl: Updated version strings. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6671 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 11 +++++++++++ pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/conf/pandora_server.conf | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 9 files changed, 19 insertions(+), 8 deletions(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index cfe42d7367..be263e2025 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,14 @@ +2012-06-21 Ramon Novoa + + * DEBIAN/control, + DEBIAN/make_deb_package.sh, + conf/pandora_server.conf, + pandora_server.spec, + lib/PandoraFMS/Config.pm, + pandora_server.redhat.spec, + util/pandora_db.pl, + util/pandora_manage.pl: Updated version strings. + 2012-06-21 Ramon Novoa * lib/PandoraFMS/Core.pm: merged from 4.0 branch. Added inventory server diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control index 39c16e8abf..e984708ffa 100644 --- a/pandora_server/DEBIAN/control +++ b/pandora_server/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-server -Version: 4.0.1 +Version: 5.0dev Architecture: all Priority: optional Section: admin diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh index f0f90cedc7..c2001f8d42 100644 --- a/pandora_server/DEBIAN/make_deb_package.sh +++ b/pandora_server/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="4.0.1" +pandora_version="5.0dev" package_cpan=0 package_pandora=1 diff --git a/pandora_server/conf/pandora_server.conf b/pandora_server/conf/pandora_server.conf index 0ffd77ce0e..9f1f9f9452 100755 --- a/pandora_server/conf/pandora_server.conf +++ b/pandora_server/conf/pandora_server.conf @@ -1,7 +1,7 @@ ############################################################################# # Pandora FMS Server Parameters # Pandora FMS, the Flexible Monitoring System. -# Version 4.0-dev +# Version 5.0dev # Licensed under GPL license v2, # (c) 2003-2011 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index 15084ca9f6..c48df7b87e 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -43,7 +43,7 @@ our @EXPORT = qw( # version: Defines actual version of Pandora Server for this module only my $pandora_version = "5.0dev"; -my $pandora_build = "120418"; +my $pandora_build = "120621"; our $VERSION = $pandora_version." ".$pandora_build; # Setup hash diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 0ac2793d05..ee0c8b13e8 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -2,7 +2,7 @@ # Pandora FMS Server # %define name pandorafms_server -%define version 4.0 +%define version 5.0dev %define release 1 Summary: Pandora FMS Server diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index c31c071b8e..28719c286c 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -2,7 +2,7 @@ # Pandora FMS Server # %define name pandorafms_server -%define version 4.0.1 +%define version 5.0dev %define release 1 Summary: Pandora FMS Server diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index be627b0ab0..9e299a852b 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -30,7 +30,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "5.0 Build 120418"; +my $version = "5.0dev PS120621"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index dfed462ff3..c1ad55eac0 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -26,7 +26,7 @@ use PandoraFMS::Core; use PandoraFMS::Config; # version: define current version -my $version = "4.0.1 PS111213"; +my $version = "5.0dev PS120621"; # Parameter my $param;