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

[Gregory Colpart]

The following commit has been merged in the debian-sid branch:
commit d02df5a5b91056f25063d30f5308fba1607615a2
Author: Gregory Colpart <reg at foulademer.gcolpart.com>
Date:   Wed Oct 21 02:40:25 2009 +0200

    refresh-patches

diff --git a/debian/changelog b/debian/changelog
index 008612d..3b80b6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ turba2 (2.3.2-1) unstable; urgency=low
   * Correct Gitweb URL in Vcs-Browser field.
   * Update to standards version 3.8.3, no further required changes. 
   * Add "Git patches" stuff in debian/rules.
+  * Add patch from Mathieu Parent (refresh-patches).
 
   [ Mathieu Parent ]
   * Added me to uploaders
@@ -13,7 +14,7 @@ turba2 (2.3.2-1) unstable; urgency=low
     (See https://www.intevation.de/roundup/kolab/issue3758) 
   * Change my email address, as I am now Debian developer
 
- -- Gregory Colpart <reg at debian.org>  Wed, 21 Oct 2009 02:17:32 +0200
+ -- Gregory Colpart <reg at debian.org>  Wed, 21 Oct 2009 02:18:00 +0200
 
 turba2 (2.3.1-1) unstable; urgency=low
 
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
new file mode 100644
index 0000000..6968265
--- /dev/null
+++ b/debian/patches/0001-When-using-Kolab-other-sources-are-removed.patch
@@ -0,0 +1,39 @@
+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