Merge branch '0.9_STABLE' of git+ssh://git.catalyst.net.nz/var/git/mahara into 0.9_STABLE

debian/changelog

-mahara (0.9.0~rc2~dev) unstable; urgency=low
+mahara (0.9.1~testing) unstable; urgency=low
 
   * Dev version
 
- -- Nigel McNie <nigel@catalyst.net.nz>  Fri, 07 Dec 2007 17:39:42 +1300
+ -- Nigel McNie <nigel@catalyst.net.nz>  Tue, 11 Dec 2007 15:22:26 +1300
+
+mahara (0.9.0-1) unstable; urgency=low
+
+  * Initial upload to unstable (closes: #447203)
+  * New upstream release
+
+ -- Nigel McNie <nigel@catalyst.net.nz>  Tue, 11 Dec 2007 15:06:32 +1300
 
 mahara (0.9.0~rc1-1) unstable; urgency=low
 

htdocs/lib/ddl.php

@@ -44,7 +44,7 @@
 
 // Mahara hacks
 $CFG->libdir = get_config('libroot');
-$CFG->prefix = $CFG->dbprefix;
+$CFG->prefix = (isset($CFG->dbprefix)) ? $CFG->dbprefix : '';
 if (is_postgres()) {
     $CFG->dbtype = 'postgres7';
 }

htdocs/lib/version.php

@@ -28,7 +28,7 @@ defined('INTERNAL') || die();
 
 $config = new StdClass;
 $config->version = 2007120700;
-$config->release = '0.9.0rc2dev';
+$config->release = '0.9.1testing';
 $config->minupgradefrom = 2007080700;
 $config->minupgraderelease = '0.8.0 (release tag 0.8.0_RELEASE)';
 $config->disablelogin = false;

scripts/release.sh

@@ -36,6 +36,7 @@ git checkout "${MAJOR}.${MINOR}_RELEASE"
 
 # Remove git directories
 rm .git -rf
+rm debian -rf
 
 # Pack MochiKit
 scripts/pack.sh