HI,
I developed the attached patch for removing the embedded copy of adodb from
moodle (1.8.2.dfsg-2). This is one of my first trials to support debian
directly.
For the patch I will do further testing, but till then here is the patch.
Cheers,
Christoph
diff -U 3 -H -b -B -d -r -N -x '*~' -- debian-orig/moodle-1.8.2.dfsg/debian/control debian/moodle-1.8.2.dfsg/debian/control
--- debian-orig/moodle-1.8.2.dfsg/debian/control 2009-01-16 01:55:38.000000000 +0100
+++ debian/moodle-1.8.2.dfsg/debian/control 2009-01-16 01:52:16.000000000 +0100
@@ -12,7 +12,7 @@
Package: moodle
Architecture: all
-Depends: ${misc:Depends}, libapache2-mod-php5 | php5-cgi, php5-pgsql | php5-mysql, php5-gd, php5-curl, php5-cli, apache2-mpm-prefork | httpd, wwwconfig-common (>= 0.0.7), mimetex, ucf, postgresql-client | mysql-client, zip, smarty, yui
+Depends: ${misc:Depends}, libapache2-mod-php5 | php5-cgi, php5-pgsql | php5-mysql, php5-gd, php5-curl, php5-cli, apache2-mpm-prefork | httpd, wwwconfig-common (>= 0.0.7), mimetex, ucf, postgresql-client | mysql-client, zip, smarty, yui,libphp-adodb (>= 4.50-1)
Pre-Depends: debconf (>= 0.5) | debconf-2.0
Recommends: postgresql | mysql-server, php5-ldap
Description: Course Management System for Online Learning
diff -U 3 -H -b -B -d -r -N -x '*~' -- debian-orig/moodle-1.8.2.dfsg/debian/rules debian/moodle-1.8.2.dfsg/debian/rules
--- debian-orig/moodle-1.8.2.dfsg/debian/rules 2009-01-16 01:55:38.000000000 +0100
+++ debian/moodle-1.8.2.dfsg/debian/rules 2009-01-16 01:47:35.000000000 +0100
@@ -62,6 +62,7 @@
rm -rf debian/moodle/usr/share/moodle/lib/smarty
rm -rf debian/moodle/usr/share/moodle/lib/yui
+ rm -rf debian/moodle/usr/share/moodle/lib/adodb
dh_installdebconf
dh_link
diff -U 3 -H -b -B -d -r -N -x '*~' -- debian-orig/moodle-1.8.2.dfsg/install.php debian/moodle-1.8.2.dfsg/install.php
--- debian-orig/moodle-1.8.2.dfsg/install.php 2009-01-16 01:55:38.000000000 +0100
+++ debian/moodle-1.8.2.dfsg/install.php 2009-01-16 01:35:34.000000000 +0100
@@ -137,7 +137,9 @@
require_once($CFG->libdir.'/moodlelib.php');
require_once($CFG->libdir.'/weblib.php');
require_once($CFG->libdir.'/deprecatedlib.php');
-require_once($CFG->libdir.'/adodb/adodb.inc.php');
+//remove adodb stuff because of getting libphp-adodb
+//require_once($CFG->libdir.'/adodb/adodb.inc.php');
+require_once("/usr/share/php/adodb/adodb.inc.php");
require_once($CFG->libdir.'/environmentlib.php');
require_once($CFG->libdir.'/xmlize.php');
require_once($CFG->libdir.'/componentlib.class.php');
diff -U 3 -H -b -B -d -r -N -x '*~' -- debian-orig/moodle-1.8.2.dfsg/lib/setup.php debian/moodle-1.8.2.dfsg/lib/setup.php
--- debian-orig/moodle-1.8.2.dfsg/lib/setup.php 2007-04-06 04:22:09.000000000 +0200
+++ debian/moodle-1.8.2.dfsg/lib/setup.php 2009-01-16 01:46:49.000000000 +0100
@@ -118,8 +118,9 @@
define ('ADODB_ASSOC_CASE', 0); //Use lowercase fieldnames for ADODB_FETCH_ASSOC
//(only meaningful for oci8po, it's the default
//for other DB drivers so this won't affect them)
-
- require_once($CFG->libdir .'/adodb/adodb.inc.php'); // Database access functions
+// remove embedded copy of adodb
+// require_once($CFG->libdir .'/adodb/adodb.inc.php'); // Database access functions
+ require_once('/usr/share/php/adodb/adodb.inc.php'); // Database access functions
$db = &ADONewConnection($CFG->dbtype);
