[pkg-horde] [SCM] Debian Horde Packages repository: turba2 package branch, debian-sid, updated. 34f202faaca85344c41f14b10ff380ebe2232d7d

[Mathieu Parent]

The following commit has been merged in the debian-sid branch:
commit 872f5aaa9a388ab5c1348d790b19f5d1064382e1
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sun Dec 20 18:47:04 2009 +0100

    Remove reverted patch

diff --git a/debian/patches/0001-When-using-Kolab-other-sources-are-removed.patch b/debian/patches/0001-When-using-Kolab-other-sources-are-removed.patch
deleted file mode 100644
index 6968265..0000000
--- a/debian/patches/0001-When-using-Kolab-other-sources-are-removed.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From f5af772ebf0ad63c06213426a789711e918740a4 Mon Sep 17 00:00:00 2001
-From: Mathieu Parent <math.parent at gmail.com>
-Date: Tue, 14 Jul 2009 14:24:00 +0200
-Subject: [PATCH 1/2] When using Kolab, other sources are removed
-
-See https://www.intevation.de/roundup/kolab/issue3758
----
- config/sources.php.dist |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/config/sources.php.dist b/config/sources.php.dist
-index bc0bf1d..bf8ab52 100644
---- a/config/sources.php.dist
-+++ b/config/sources.php.dist
-@@ -772,6 +772,9 @@ if (!empty($GLOBALS['conf']['imsp']['enabled']) ||
- 
- /* Begin Kolab sources. */
- if (!empty($GLOBALS['conf']['kolab']['enabled'])) {
-+    // When using Kolab, other sources are removed
-+    $cfgSources = Array();
-+    
- 
-     /* Only use LDAP if we have that extension in PHP */
-     if (function_exists('ldap_connect')) {
-@@ -805,9 +808,11 @@ if (!empty($GLOBALS['conf']['kolab']['enabled'])) {
-                 'version' => 3,
-                 'bind_dn' => '',
-                 'bind_password' => '',
-+                'read_only' => true,
-             ),
-             'map' => array(
-                 '__key'             => 'dn',
-+                '__uid'             => 'dn',
-                 'name'              => 'cn',
-                 'firstname'         => 'givenName',
-                 'lastname'          => 'sn',
--- 
-1.6.5
-

-- 
Debian Horde Packages repository: turba2 package