2012-06-21 Ramon Novoa <rnovoa@artica.es>

* 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
This commit is contained in:
Ramon Novoa 2012-06-21 17:39:54 +00:00
parent fc4a387a99
commit f987b23920
9 changed files with 19 additions and 8 deletions

View File

@ -1,3 +1,14 @@
2012-06-21 Ramon Novoa <rnovoa@artica.es>
* 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 <rnovoa@artica.es> 2012-06-21 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: merged from 4.0 branch. Added inventory server * lib/PandoraFMS/Core.pm: merged from 4.0 branch. Added inventory server

View File

@ -1,5 +1,5 @@
package: pandorafms-server package: pandorafms-server
Version: 4.0.1 Version: 5.0dev
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="4.0.1" pandora_version="5.0dev"
package_cpan=0 package_cpan=0
package_pandora=1 package_pandora=1

View File

@ -1,7 +1,7 @@
############################################################################# #############################################################################
# Pandora FMS Server Parameters # Pandora FMS Server Parameters
# Pandora FMS, the Flexible Monitoring System. # Pandora FMS, the Flexible Monitoring System.
# Version 4.0-dev # Version 5.0dev
# Licensed under GPL license v2, # Licensed under GPL license v2,
# (c) 2003-2011 Artica Soluciones Tecnologicas # (c) 2003-2011 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

View File

@ -43,7 +43,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only # version: Defines actual version of Pandora Server for this module only
my $pandora_version = "5.0dev"; my $pandora_version = "5.0dev";
my $pandora_build = "120418"; my $pandora_build = "120621";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash # Setup hash

View File

@ -2,7 +2,7 @@
# Pandora FMS Server # Pandora FMS Server
# #
%define name pandorafms_server %define name pandorafms_server
%define version 4.0 %define version 5.0dev
%define release 1 %define release 1
Summary: Pandora FMS Server Summary: Pandora FMS Server

View File

@ -2,7 +2,7 @@
# Pandora FMS Server # Pandora FMS Server
# #
%define name pandorafms_server %define name pandorafms_server
%define version 4.0.1 %define version 5.0dev
%define release 1 %define release 1
Summary: Pandora FMS Server Summary: Pandora FMS Server

View File

@ -30,7 +30,7 @@ use PandoraFMS::Tools;
use PandoraFMS::DB; use PandoraFMS::DB;
# version: define current version # version: define current version
my $version = "5.0 Build 120418"; my $version = "5.0dev PS120621";
# Pandora server configuration # Pandora server configuration
my %conf; my %conf;

View File

@ -26,7 +26,7 @@ use PandoraFMS::Core;
use PandoraFMS::Config; use PandoraFMS::Config;
# version: define current version # version: define current version
my $version = "4.0.1 PS111213"; my $version = "5.0dev PS120621";
# Parameter # Parameter
my $param; my $param;