From f77ddac4ed2a31551499cbb2cdf93f0970cc7f83 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Tue, 25 Jan 2011 06:23:31 +0000 Subject: [PATCH] set version to 0.9.17 for upcoming release --- install/froxlor.sql | 2 +- install/updates/froxlor/0.9/update_0.9.inc.php | 8 ++++++++ lib/tables.inc.php | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/install/froxlor.sql b/install/froxlor.sql index 7a5e2943..11b5b4ea 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -462,7 +462,7 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (18, 'system', 'vmail_homedir', '/var/customers/mail/'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (19, 'system', 'bindconf_directory', '/etc/bind/'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (20, 'system', 'bindreload_command', '/etc/init.d/bind9 reload'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.17-svn1'); +INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.17'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (23, 'system', 'hostname', 'SERVERNAME'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (24, 'login', 'maxloginattempts', '3'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (25, 'login', 'deactivatetime', '900'); diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index 45da31f5..4b31dd49 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -1411,3 +1411,11 @@ if(isFroxlorVersion('0.9.17-svn1')) updateToVersion('0.9.17-svn2'); } + +if(isFroxlorVersion('0.9.17-svn2')) +{ + showUpdateStep("Updating from 0.9.17-svn2 to 0.9.17 final"); + lastStepStatus(0); + + updateToVersion('0.9.17'); +} diff --git a/lib/tables.inc.php b/lib/tables.inc.php index bd890c97..f139b6d5 100644 --- a/lib/tables.inc.php +++ b/lib/tables.inc.php @@ -73,7 +73,7 @@ define('PACKAGE_ENABLED', 2); // VERSION INFO -$version = '0.9.17-svn2'; +$version = '0.9.17'; $dbversion = '2'; $branding = '';