From 2156da2ec04152568707de1a2205999ed856ebd0 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Thu, 20 May 2010 13:05:34 +0000 Subject: [PATCH] 2010-05-20 Ramon Novoa * DEBIAN/control, DEBIAN/make_deb_package.sh, include/config_process.php, pandora_console.spec: Updated for the release of Pandora FMS 3.1 RC1. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2770 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 6 ++++++ pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 8 ++++---- pandora_console/include/config_process.php | 4 ++-- pandora_console/pandora_console.spec | 4 ++-- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index e93e55b7e7..f23fde3fd6 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2010-05-20 Ramon Novoa + + * DEBIAN/control, DEBIAN/make_deb_package.sh, + include/config_process.php, pandora_console.spec: Updated for the + release of Pandora FMS 3.1 RC1. + 2010-05-20 Raúl Mateos * operation/users/user_edit.php: Updated year. Use better table in group diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index cd6cafe732..c2012bb43e 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: PandoraFMS-Console -Version: 3.0.0.20091028 +Version: 3.1rc1 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 df342c1e0f..59eea6445b 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_console_version="3.1.0" +pandora_version="3.1rc1" package_pear=1 package_pandora=1 @@ -94,7 +94,7 @@ then cp -R DEBIAN temp_package find temp_package/var/www/pandora_console -name ".svn" | xargs rm -Rf rm -Rf temp_package/var/www/pandora_console/pandora_console.spec - chmod 777 -R temp_package/DEBIAN + chmod 755 -R temp_package/DEBIAN echo "Calculate md5sum for md5sums package control file." for item in `find temp_package` @@ -118,7 +118,7 @@ then echo "Make the package \"Pandorafms console\"." dpkg-deb --build temp_package - mv temp_package.deb pandorafms.console_$pandora_console_version.deb + mv temp_package.deb pandorafms.console_$pandora_version.deb fi if [ $package_pear -eq 1 ] @@ -137,4 +137,4 @@ fi echo "Delete the \"temp_package\" temporary dir for job." rm -Rf temp_package -echo "DONE: Package ready at: ../pandorafms.console_$pandora_console_version.deb" +echo "DONE: Package ready at: ../pandorafms.console_$pandora_version.deb" diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 10daf51b18..67d148405b 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 = 'PC100506'; // Remember is YYMMDD -$pandora_version = 'v3.1-dev'; +$build_version = 'PC100519'; // Remember is YYMMDD +$pandora_version = 'v3.1rc1'; /* 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 495132c524..5fbc09397d 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.0.0 -%define release 4 +%define version 3.1rc1 +%define release 1 %define httpd_name httpd # User and Group under which Apache is running %define httpd_name apache2