From 2c3a11cff950c21bbea808ae8f6385cda5e0b9a6 Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Mon, 14 Jun 2010 07:58:38 +0000 Subject: [PATCH] Preparing tagging of 0.9.9 --- install/froxlor.sql | 2 +- install/updates/froxlor/0.9/update_0.9.inc.php | 7 +++++++ lib/tables.inc.php | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/install/froxlor.sql b/install/froxlor.sql index 17e7dda2..e73646f5 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -451,7 +451,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.9-svn1'); +INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.9'); 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 c9e615dd..30534aec 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -788,4 +788,11 @@ if(isFroxlorVersion('0.9.8')) updateToVersion('0.9.9-svn1'); } +if(isFroxlorVersion('0.9.9-svn1')) +{ + showUpdateStep("Updating from 0.9.9-svn1 to 0.9.9 final"); + lastStepStatus(0); + updateToVersion('0.9.9'); +} + ?> diff --git a/lib/tables.inc.php b/lib/tables.inc.php index 291f2e3f..58729288 100644 --- a/lib/tables.inc.php +++ b/lib/tables.inc.php @@ -72,7 +72,7 @@ define('PACKAGE_ENABLED', 2); // VERSION INFO -$version = '0.9.9-svn1'; +$version = '0.9.9'; $dbversion = '2'; $branding = '';