[pkg-horde] [SCM] Debian Horde Packages repository: ingo1 package branch, debian-sid, updated. 9821700ef6f05d6cb1d8a1fd81027a49beeffd90
Mathieu Parent
math.parent at gmail.com
Mon Dec 21 17:18:09 UTC 2009
The following commit has been merged in the debian-sid branch:
commit 1e48ad29a53172344c20420ebe45c8634b84767a
Merge: 58f6da49f30e12d8dc19e34dbe5d9d0019ab2333 0460be08033ca2f950178fae70633f16f14808df
Author: Mathieu Parent <math.parent at gmail.com>
Date: Mon Dec 21 18:11:14 2009 +0100
Merge branch 'upstream+repack' into debian-sid
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
More information about the pkg-horde-hackers
mailing list