Refresh all patches so that they apply without any fuzz

[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 1b134027dd4bd89bd2ccfa1636c2b22a2eda7314..04ec738a1c854a90511b0e9d39611721e8bb9750 100644 (file)
--- a/debian/patches/correct_install_path.patch
+++ b/debian/patches/correct_install_path.patch
@@ -1,11 +1,15 @@
---- 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');
+Install path is /var/lib/roundcube for Debian. Don't try to guess it.
+
+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
+@@ -27,7 +27,7 @@
+ define('JS_OBJECT_NAME', 'rcmail');
  
- if (empty($INSTALL_PATH))
+ if (!defined('INSTALL_PATH')) {
+-  define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
++  define('INSTALL_PATH', '/var/lib/roundcube/');
+ }
+ 
+ define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');