Commit 90bc4628 authored by Francois Marier's avatar Francois Marier
Browse files
parents e77459dc 175f667c
mahara (0.9.0~alpha3~dev) unstable; urgency=low
mahara (0.9.0~beta2~dev) unstable; urgency=low
* Dev version
-- Nigel McNie <nigel@catalyst.net.nz> Sat, 24 Nov 2007 10:38:02 +1300
mahara (0.9.0~beta1-1) unstable; urgency=low
* New upstream release
* User config files (config.php and apache.conf) are no longer overwritten
by debconf. Also make robots.txt a config file.
* Create a common mahara package which contains everything but the Apache
......@@ -20,7 +27,7 @@ mahara (0.9.0~alpha3~dev) unstable; urgency=low
* Check for the existence of the cron script before running it
* Use po-debconf and provide a French translation
-- Francois Marier <francois@catalyst.net.nz> Fri, 23 Nov 2007 12:24:25 +1300
-- Nigel McNie <nigel@catalyst.net.nz> Sat, 24 Nov 2007 10:24:48 +1300
mahara (0.9.0~alpha2-1) unstable; urgency=low
......
......@@ -2,4 +2,4 @@
# Mahara implements its own cron to cater for people who need to run it in
# situations where normal unixy cron isn't available.
#
* * * * * www-data if [ -r /usr/share/mahara/lib/cron.php ] ; then /usr/bin/php5 /usr/share/mahara/lib/cron.php >>/var/log/mahara-cron.log 2>&1 ; fi
* * * * * www-data if [ -r /usr/share/mahara/lib/cron.php ] ; then /usr/bin/php5 /usr/share/mahara/lib/cron.php >>/var/log/mahara/cron.log 2>&1 ; fi
......@@ -2,3 +2,4 @@ etc/mahara
usr/share/mahara
var/lib/mahara
var/lib/mahara/smarty/compile
var/log/mahara
/var/log/mahara-cron.log {
/var/log/mahara/cron.log {
create 644 www-data www-data
rotate 12
weekly
......
......@@ -59,8 +59,8 @@ case "$1" in
echo "?>" >> $CONFIG_DEBCONF_PHP
# Touch cron log
touch /var/log/mahara-cron.log
chown www-data:www-data /var/log/mahara-cron.log
touch /var/log/mahara/cron.log
chown www-data:www-data /var/log/mahara/cron.log
# Link to captcha font
ln -s /usr/share/fonts/truetype/freefont/FreeMono.ttf /usr/share/mahara/theme/default/static/captcha.ttf
......
......@@ -22,7 +22,7 @@ set -e
case "$1" in
purge)
rm -f /var/log/mahara-cron.log*
rm -f /var/log/mahara/cron.log*
[ -d /var/lib/mahara ] && echo "NOTE: purge does _not_ remove /var/lib/mahara, you must do this yourself if you really want to!"
;;
remove)
......
......@@ -308,7 +308,7 @@ function xmldb_core_upgrade($oldversion=0) {
$table->addFieldInfo('blocktype', XMLDB_TYPE_CHAR, 255, XMLDB_UNSIGNED, XMLDB_NOTNULL);
$table->addFieldInfo('title', XMLDB_TYPE_CHAR, 255, XMLDB_UNSIGNED, XMLDB_NOTNULL);
$table->addFieldInfo('configdata', XMLDB_TYPE_TEXT, null);
$table->addFieldInfo('view', XMLDB_TYPE_INTEGER, 10, XMLDB_UNSIGNED, XMLDB_NOTNULL);
$table->addFieldInfo('view', XMLDB_TYPE_INTEGER, 10, false, XMLDB_NOTNULL);
$table->addFIeldInfo('column', XMLDB_TYPE_INTEGER, 2, XMLDB_UNSIGNED, XMLDB_NOTNULL);
$table->addFIeldInfo('order', XMLDB_TYPE_INTEGER, 2, XMLDB_UNSIGNED, XMLDB_NOTNULL);
$table->addKeyInfo('primary', XMLDB_KEY_PRIMARY, array('id'));
......@@ -320,7 +320,7 @@ function xmldb_core_upgrade($oldversion=0) {
// move old block field in view_artefact out of the way
table_column('view_artefact', 'block', 'oldblock', 'text');
table_column('view_artefact', 'block', 'oldblock', 'text', '', '', null);
$table = new XMLDBTable('view_artefact');
$field = new XMLDBField('block');
......@@ -334,8 +334,14 @@ function xmldb_core_upgrade($oldversion=0) {
// given that the table needs to be used by block instances being
// created, make the fields nullable during that time.
// Note - XMLDB - you are a whore. Hate, Nigel
execute_sql('ALTER TABLE {view_artefact} ALTER ctime DROP NOT NULL');
execute_sql('ALTER TABLE {view_artefact} ALTER format DROP NOT NULL');
if (is_postgres()) {
execute_sql('ALTER TABLE {view_artefact} ALTER ctime DROP NOT NULL');
execute_sql('ALTER TABLE {view_artefact} ALTER format DROP NOT NULL');
}
else {
execute_sql('ALTER TABLE {view_artefact} CHANGE ctime ctime DATETIME');
execute_sql('ALTER TABLE {view_artefact} CHANGE format format TEXT');
}
// Install all the blocktypes and their categories now, as they'll be
// needed for the template migration
......@@ -358,13 +364,24 @@ function xmldb_core_upgrade($oldversion=0) {
upgrade_template_migration();
delete_records_select('view_artefact', 'block IS NULL');
execute_sql('ALTER TABLE {view_artefact} ALTER block SET NOT NULL');
if (is_postgres()) {
execute_sql('ALTER TABLE {view_artefact} ALTER block SET NOT NULL');
}
else {
execute_sql('ALTER TABLE {view_artefact} CHANGE block block BIGINT(10) UNSIGNED NOT NULL');
}
$table = new XMLDBTable('view_artefact');
$field = new XMLDBField('oldblock');
drop_field($table, $field);
$table = new XMLDBTable('view');
// Especially for MySQL cos it's "advanced"
$key = new XMLDBKey('templatefk');
$key->setAttributes(XMLDB_KEY_FOREIGN, array('template'), 'template', array('name'));
drop_key($table, $key);
$field = new XMLDBField('template');
drop_field($table, $field);
......
......@@ -28,7 +28,7 @@ defined('INTERNAL') || die();
$config = new StdClass;
$config->version = 2007112300;
$config->release = '0.9.0alpha3dev';
$config->release = '0.9.0beta2dev';
$config->minupgradefrom = 2007080700;
$config->minupgraderelease = '0.8.0 (release tag 0.8.0_RELEASE)';
$config->disablelogin = false;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment