From fa0bbd5077470fb8effcca9ed92dcaa21126acb6 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Tue, 8 Jun 2010 17:01:48 +0000 Subject: [PATCH] 2010-06-08 Ramon Novoa * pandoradb_data.sql, DEBIAN/control, DEBIAN/make_deb_package.sh, include/config_process.php, pandora_console.spec: Update version strings. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2879 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 6 ++++++ pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 4 ++-- pandora_console/pandora_console.spec | 4 ++-- pandora_console/pandoradb_data.sql | 4 ++-- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 1ca14b4f2a..dfaa71a450 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2010-06-08 Ramon Novoa + + * pandoradb_data.sql, DEBIAN/control, + DEBIAN/make_deb_package.sh, include/config_process.php, + pandora_console.spec: Update version strings. + 2010-06-08 Miguel de Dios * godmode/reporting/reporting_builder.main.php: changed the text of button diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index c2012bb43e..8eca76da2d 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: PandoraFMS-Console -Version: 3.1rc1 +Version: 3.1 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index 311383536f..3bb1b70bc0 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/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="3.1rc1" +pandora_version="3.1" package_pear=1 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 6be000f63d..8983fb502a 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,8 +22,8 @@ /** * Pandora build version and version */ -$build_version = 'PC100524'; // Remember is YYMMDD -$pandora_version = 'v3.1rc2'; +$build_version = 'PC100608'; +$pandora_version = 'v3.1'; /* Help to debug problems. Override global PHP configuration */ if (!isset($develop_bypass)) $develop_bypass = 0; diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec index f5c54581a0..113304b652 100755 --- a/pandora_console/pandora_console.spec +++ b/pandora_console/pandora_console.spec @@ -2,8 +2,8 @@ # Pandora FMS Console # %define name pandorafms_console -%define version 3.1rc1 -%define release 1 +%define version 3.1 +%define release 1 %define httpd_name httpd # User and Group under which Apache is running %define httpd_name apache2 diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index e1f32f0dcf..13f3e6dfe6 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -46,8 +46,8 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_compact','15'), ('graph_res','5'), ('step_compact','1'), -('db_scheme_version','3.1rc1'), -('db_scheme_build','PD100515'), +('db_scheme_version','3.1'), +('db_scheme_build','PD100608'), ('show_unknown','0'), ('show_lastalerts','1'), ('style','pandora'),