2011-09-23 Sancho Lerena <slerena@artica.es>

* pandoradb_data.sql: Update version and DB Build.

        * DEBIAN/control, 
        DEBIAN/make_deb_package.sh
        include/config.php
        include/config_process.php
        pandora_console_install
        install.php
        pandora_console.spec
        pandora_console.redhat.spec: Updated version.

        * extras/pandoradb_migrate_v3.2_to_v4.0.sql: Update version after
        migrate.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4992 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

pandora_console/ChangeLog

@@ -1,3 +1,19 @@
+2011-09-23  Sancho Lerena <slerena@artica.es>
+
+	* pandoradb_data.sql: Update version and DB Build.
+
+	* DEBIAN/control,
+	DEBIAN/make_deb_package.sh
+	include/config.php
+	include/config_process.php
+	pandora_console_install
+	install.php
+	pandora_console.spec
+	pandora_console.redhat.spec: Updated version.
+
+	* extras/pandoradb_migrate_v3.2_to_v4.0.sql: Update version after
+	migrate.
+
 2011-09-23 Miguel de Dios  <miguel.dedios@artica.es>
 	
 	* operation/agentes/status_monitor.php: fixed the query for to don't show

pandora_console/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 4.0RC1
+Version: 4.0
 Architecture: all
 Priority: optional
 Section: admin

pandora_console/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.0RC1"
+pandora_version="4.0"
 
 package_pear=0
 package_pandora=1

pandora_console/extras/pandoradb_migrate_v3.2_to_v4.0.sql

@@ -259,3 +259,7 @@ ALTER TABLE `talert_snmp` MODIFY COLUMN `custom_oid` text DEFAULT '';
 -- Table `tconfig_os`
 -- -----------------------------------------------------
 INSERT INTO `tconfig_os` (`name`, `description`, `icon_name`) VALUES ('VMware', 'VMware Architecture', 'so_vmware.png');
+
+UPDATE tconfig SET value='4.0' WHERE token = 'db_scheme_version';
+UPDATE tconfig SET value='PD110923 (3.2 Migrate)' WHERE token = 'db_scheme_build';
+

pandora_console/include/config_process.php

@@ -22,8 +22,8 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC110819';
+$build_version = 'PC110923';
-$pandora_version = 'v4.0RC1';
+$pandora_version = 'v4.0';
 
 date_default_timezone_set("Europe/Berlin");
 

pandora_console/install.php

@@ -66,8 +66,8 @@ function ChangeDBAction(causer) {
 
 <?php
 
-$version = "4.0-dev";
+$version = "4.0";
-$build = "110617";
+$build = "110923";
 $banner = "v$version Build $build";
 
 error_reporting(0);

pandora_console/pandora_console.redhat.spec

@@ -2,7 +2,7 @@
 # Pandora FMS Console
 #
 %define name        pandorafms_console
-%define version     4.0RC1
+%define version     4.0
 %define release     1
 
 %define httpd_name      httpd

pandora_console/pandora_console.spec

@@ -2,7 +2,7 @@
 # Pandora FMS Console
 #
 %define name        pandorafms_console
-%define version     4.0RC1
+%define version     4.0
 %define release     1
 %define httpd_name      httpd
 # User and Group under which Apache is running

pandora_console/pandora_console_install

@@ -9,7 +9,7 @@
 # This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION=4.0dev
+PI_VERSION=4.0
 FORCE=0
 LOG_TIMESTAMP=`date +"%Y/%m/%d %H:%M:%S"`
 MODE=$1

pandora_console/pandoradb_data.sql

@@ -47,8 +47,8 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
 ('days_compact','90'),
 ('graph_res','5'),
 ('step_compact','1'),
-('db_scheme_version','4.0RC1'),
+('db_scheme_version','4.0'),
-('db_scheme_build','PD110810'),
+('db_scheme_build','PD110923'),
 ('show_unknown','0'),
 ('show_lastalerts','1'),
 ('style','pandora'),