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

[roundcube.git] / debian / patches / correct_install_path.patch

diff --git a/debian/patches/correct_install_path.patch b/debian/patches/correct_install_path.patch
index b8e6daa45abcec466b34ac85a7ecabf65bf0df84..6afa0984acb4ff25003c34682d8d1895e336be37 100644 (file)
--- a/debian/patches/correct_install_path.patch
+++ b/debian/patches/correct_install_path.patch
@@ -1,13 +1,15 @@
 Install path is /var/lib/roundcube for Debian. Don't try to guess it.
 
---- a/program/include/iniset.php~      2008-06-09 22:57:53.000000000 +0200
-+++ a/program/include/iniset.php       2008-06-22 12:10:55.000000000 +0200
-@@ -27,7 +27,7 @@
- define('JS_OBJECT_NAME', 'rcmail');
+Index: b/program/include/iniset.php
+===================================================================
+--- a/program/include/iniset.php       2010-07-17 17:33:04.000000000 +0200
++++ b/program/include/iniset.php       2010-07-17 17:33:23.000000000 +0200
+@@ -42,7 +42,7 @@
+ define('RCMAIL_START', microtime(true));
  
  if (!defined('INSTALL_PATH')) {
--  define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
-+  define('INSTALL_PATH', '/var/lib/roundcube/');
+-    define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
++    define('INSTALL_PATH', '/var/lib/roundcube/');
  }
- 
- // make sure path_separator is defined
+
+ if (!defined('RCMAIL_CONFIG_DIR')) {