Handle incorrect upgrade from 0.3.1-6 when "changed" column already

[roundcube.git] / debian / patches / dbconfig-common_support.patch

diff --git a/debian/patches/dbconfig-common_support.patch b/debian/patches/dbconfig-common_support.patch
index 8e1f71d3ba2e7a330ab80ffd3806a4bd90c2d00b..574c67ec084341e303a22fa4a17a8662c2d3b30c 100644 (file)
--- a/debian/patches/dbconfig-common_support.patch
+++ b/debian/patches/dbconfig-common_support.patch
@@ -1,18 +1,23 @@
---- roundcube_0.1~beta2.2/config/db.inc.php.dist        2006-03-20 23:08:51.000000000 +0100
-+++ roundcube_0.1~beta2.2/config/db.inc.php.dist  2007-03-13 14:33:38.000000000 +0100
-@@ -14,13 +14,20 @@
+The default db.inc.php is modified to adapt it to the use of dbconfig-common package.
 
+Index: b/config/db.inc.php.dist
+===================================================================
+--- a/config/db.inc.php.dist   2010-07-17 17:33:04.000000000 +0200
++++ b/config/db.inc.php.dist   2010-07-17 17:33:23.000000000 +0200
+@@ -14,15 +14,20 @@
+ 
  $rcmail_config = array();
-
+ 
 -// PEAR database DSN for read/write operations
--// format is db_provider://user:password@host/databse
--// currentyl suported db_providers: mysql, pgsql, sqlite
--
+-// format is db_provider://user:password@host/database 
+-// For examples see http://pear.php.net/manual/en/package.database.mdb2.intro-dsn.php
+-// currently supported db_providers: mysql, mysqli, pgsql, sqlite, mssql or sqlsrv
++/* Do not set db_dsnw here, use dpkg-reconfigure roundcube-core to configure database ! */
+ 
 -$rcmail_config['db_dsnw'] = 'mysql://roundcube:pass@localhost/roundcubemail';
 -// postgres example: 'pgsql://roundcube:pass@localhost/roundcubemail';
--// sqlite example: 'sqlite://./sqlite.db?mode=0646';
-+/* Do not set db_dsnw here, use dpkg-reconfigure roundcube to configure database ! */
-+
+-// Warning: for SQLite use absolute path in DSN:
+-// sqlite example: 'sqlite:////full/path/to/sqlite.db?mode=0646';
 +include_once("/etc/roundcube/debian-db.php");
 +
 +switch ($dbtype) {
@@ -25,7 +30,6 @@
 +   $rcmail_config['db_dsnw'] = "$dbtype://$dbuser:$dbpass@$dbserver$dbport/$dbname";
 +   break;
 + }
-
+ 
  // PEAR database DSN for read only operations (if empty write database will be used)
  // useful for database replication
-