[pkg-horde] [SCM] Debian Horde Packages repository: ingo1 package branch, upstream+patches, updated. 89699c83956d4f35d41b83b8ad998ee803c57254

[Mathieu Parent]

The following commit has been merged in the upstream+patches branch:
commit 89699c83956d4f35d41b83b8ad998ee803c57254
Merge: 51dd464c158f47c3639c7070bd7cbe6d21389dfe 8bba3f5dce90cdbacbdd7369bba32db62ac412aa
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Mon Dec 21 18:07:33 2009 +0100

    Merge branch 'upstream' into upstream+patches

diff --combined config/backends.php.dist
index 2b33170,531cc83..d6ce598
--- a/config/backends.php.dist
+++ b/config/backends.php.dist
@@@ -1,6 -1,6 +1,6 @@@
  <?php
  /**
-  * $Horde: ingo/config/backends.php.dist,v 1.20.8.12 2008/12/15 02:33:07 chuck Exp $
+  * $Horde: ingo/config/backends.php.dist,v 1.20.8.12 2008-12-15 02:33:07 chuck Exp $
   *
   * Ingo works purely on a preferred mechanism for server selection. There are
   * a number of properties that you can set for each backend:
@@@ -300,9 -300,6 +300,9 @@@ $backends['ldapsieve'] = array
  
  /* Kolab Example (using Sieve) */
  if ($GLOBALS['conf']['kolab']['enabled']) {
 +    // When using Kolab, other backends are removed
 +    $backends = Array();
 +    
      require_once 'Horde/Kolab.php';
  
      if (!is_callable('Kolab', 'getServer')) {
diff --combined config/prefs.php.dist
index c92a753,05ae684..037fe4f
--- a/config/prefs.php.dist
+++ b/config/prefs.php.dist
@@@ -1,12 -1,12 +1,12 @@@
  <?php
  /**
-  * $Horde: ingo/config/prefs.php.dist,v 1.30.10.3 2008/06/15 21:14:38 chuck Exp $
+  * $Horde: ingo/config/prefs.php.dist,v 1.30.10.3 2008-06-15 21:14:38 chuck Exp $
   *
   * See horde/config/prefs.php for documentation on the structure of this file.
   */
  
  // Make sure that INGO_STORAGE_* constants are defined.
 -require_once dirname(__FILE__) . '/../lib/Storage.php';
 +require_once HORDE_BASE . '/ingo/lib/Storage.php';
  
  // This preference group will only be displayed if the configured
  // Ingo_Script:: driver can create script files.

-- 
Debian Horde Packages repository: ingo1 package