Imported Debian patch 0.3.1-4

[roundcube.git] / debian / patches / correct-magic-path.patch

diff --git a/debian/patches/correct-magic-path.patch b/debian/patches/correct-magic-path.patch
index de9330f217e418d01c34fcaaa9ca7955d7ada2e9..e2ca99fa8e487826ab1a94c92956a8fad8504033 100644 (file)
--- a/debian/patches/correct-magic-path.patch
+++ b/debian/patches/correct-magic-path.patch
@@ -1,13 +1,15 @@
 On Debian, the magic file is in /usr/share/file/magic.
 
---- roundcube-0.1/config/main.inc.php.dist~    2008-02-21 11:27:19.000000000 +0100
-+++ roundcube-0.1/config/main.inc.php.dist     2008-03-06 14:04:53.000000000 +0100
-@@ -277,7 +277,7 @@
+Index: b/config/main.inc.php.dist
+===================================================================
+--- a/config/main.inc.php.dist 2009-10-21 10:47:40.000000000 +0200
++++ b/config/main.inc.php.dist 2010-07-17 17:33:23.000000000 +0200
+@@ -338,7 +338,7 @@
  $rcmail_config['max_pagesize'] = 200;
  
  // mime magic database
 -$rcmail_config['mime_magic'] = '/usr/share/misc/magic';
 +$rcmail_config['mime_magic'] = '/usr/share/file/magic';
  
- // end of config file
- ?>
+ // default sort col
+ $rcmail_config['message_sort_col'] = 'date';