Debugged dbconfig base files, added default install path as a patch

diff --git a/debian/install b/debian/install
index 39d6a41c8cfc7eef413a5a3f2c4f009af183556c..e025be8c04ed0c91cd1616ee86546671eaad4e28 100644 (file)
--- a/debian/install
+++ b/debian/install
@@ -1,6 +1,3 @@
 index.php program/ usr/share/roundcube
 skins temp var/lib/roundcube
 debian/conf/* etc/roundcube
-SQL/mysql.initial.sql usr/share/dbconfig-common/data/roundcube/install/mysql
-SQL/postgres.initial.sql usr/share/dbconfig-common/data/roundcube/install/pqsql
-SQL/sqlite.initial.sql usr/share/dbconfig-common/data/roundcube/install/sqlite

diff --git a/debian/patches/correct_install_path.patch b/debian/patches/correct_install_path.patch
new file mode 100644 (file)
index 0000000..1b13402
--- /dev/null
+++ b/debian/patches/correct_install_path.patch
@@ -0,0 +1,11 @@
+--- roundcube-0.1~beta2.2/index.php    2006-12-22 23:26:24.000000000 +0100
++++ roundcube-0.1~beta2.2/index.php    2007-03-13 15:36:21.000000000 +0100
+@@ -46,7 +46,7 @@
+ $CHARSET = 'UTF-8';
+ $OUTPUT_TYPE = 'html';
+ $JS_OBJECT_NAME = 'rcmail';
+-$INSTALL_PATH = dirname(__FILE__);
++$INSTALL_PATH = '/var/lib/roundcube';
+ $MAIN_TASKS = array('mail','settings','addressbook','logout');
+ 
+ if (empty($INSTALL_PATH))

diff --git a/debian/patches/series b/debian/patches/series
index f86a938a08881a864efb57ed5a8dca963421ab46..70787a45ab02e52e5aa2845a7e992919f24d1e50 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 dbconfig-common_support.patch
+correct_install_path.patch

diff --git a/debian/rules b/debian/rules
index 875d56ccada239e44b3c2bbc430682eee7cb93d1..196ff0072357992f534a1fd6ae7c6799d838692f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,10 @@ binary-install/roundcube::
        done
        # Install config/db.inc.php.dist
        install -m 0640 $(CURDIR)/config/db.inc.php.dist $(CURDIR)/debian/roundcube/etc/roundcube/db.inc.php
+       # Install empty tables for each db type
+       install -m 0644 $(CURDIR)/SQL/mysql.initial.sql $(CURDIR)/debian/roundcube/usr/share/dbconfig-common/data/roundcube/install/mysql
+       install -m 0644 $(CURDIR)/SQL/postgres.initial.sql $(CURDIR)/debian/roundcube/usr/share/dbconfig-common/data/roundcube/install/pgsql
+       install -m 0644 $(CURDIR)/SQL/sqlite.initial.sql $(CURDIR)/debian/roundcube/usr/share/dbconfig-common/data/roundcube/install/sqlite     
        # Some files are executable while not being scripts or binary...
        chmod -x $(CURDIR)/debian/roundcube/usr/share/roundcube/program/include/rcube_mdb2.inc
        chmod -x $(CURDIR)/debian/roundcube/var/lib/roundcube/skins/default/images/icons/plus.gif
@@ -32,7 +36,6 @@ binary-install/roundcube::
        chmod -x $(CURDIR)/debian/roundcube/usr/share/roundcube/program/include/rcube_db.inc
        chmod -x $(CURDIR)/debian/roundcube/var/lib/roundcube/skins/default/images/buttons/down_arrow.png
        chmod -x $(CURDIR)/debian/roundcube/var/lib/roundcube/skins/default/googiespell.css
-       chmod -x $(CURDIR)/debian/roundcube/usr/share/dbconfig-common/data/roundcube/install/pqsql/postgres.initial.sql
        chmod -x $(CURDIR)/debian/roundcube/usr/share/roundcube/program/js/googiespell.js
 
 cleanbuilddir/roundcube::