From 47cc06933f0743e4c1731352905818f6c9b23109 Mon Sep 17 00:00:00 2001 From: slerena Date: Wed, 10 Nov 2010 13:15:59 +0000 Subject: [PATCH] 2010-11-10 Sancho Lerena * pandoradb_data.sql, DEBIAN/control, DEBIAN/make_deb_package.sh, include/config_process.php, pandora_console.redhat.spec: Last updates on version and spec files for release. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3569 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 9 +++++++++ pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/pandora_console.redhat.spec | 5 ----- pandora_console/pandoradb_data.sql | 2 +- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 4aa1ab08ef..c225f85321 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2010-11-10 Sancho Lerena + + * pandoradb_data.sql, + DEBIAN/control, + DEBIAN/make_deb_package.sh, + include/config_process.php, + pandora_console.redhat.spec: Last updates on version and + spec files for release. + 2010-11-10 Sergio Martin * include/functions.php: Check de enterprise version to diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 752596378a..248c7be091 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: PandoraFMS-Console -Version: 3.2 +Version: 3.2RC1 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 92f734e473..a4dc280dea 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.2" +pandora_version="3.2RC1" package_pear=1 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index e82a1c945d..da514a948c 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC101103'; +$build_version = 'PC101108'; $pandora_version = 'v3.2RC1'; /* Help to debug problems. Override global PHP configuration */ diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec index 8983c42bd2..40ad87ee90 100755 --- a/pandora_console/pandora_console.redhat.spec +++ b/pandora_console/pandora_console.redhat.spec @@ -22,7 +22,6 @@ License: GPL Vendor: Artica ST #Source0: %{name}-%{version}-%{revision}.tar.gz Source0: %{name}-%{version}.tar.gz -Source1: extras/%{name}-logrotate URL: http://www.pandorafms.com Group: Productivity/Networking/Web/Utilities Packager: Sancho Lerena @@ -53,11 +52,9 @@ rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{prefix}/pandora_console #mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/pandora/data_in -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ cp -aRf * $RPM_BUILD_ROOT%{prefix}/pandora_console rm $RPM_BUILD_ROOT%{prefix}/pandora_console/*.spec rm $RPM_BUILD_ROOT%{prefix}/pandora_console/pandora_console_install -install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/pandora_console %clean rm -rf $RPM_BUILD_ROOT @@ -86,8 +83,6 @@ fi %docdir %{prefix}/pandora_console/docs %{prefix}/pandora_console -%defattr(0644,root,root) -%{_sysconfdir}/logrotate.d/pandora_console %defattr(770,pandora,%{httpd_group}) /var/spool/pandora/data_in diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index bdde93a1e0..7ce4afda46 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -47,7 +47,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('graph_res','5'), ('step_compact','1'), ('db_scheme_version','3.2RC1'), -('db_scheme_build','PD101103'), +('db_scheme_build','PD101108'), ('show_unknown','0'), ('show_lastalerts','1'), ('style','pandora'),