Branch '2.3-stable' - 2 commits - kolab-webclient/turba release-notes.txt

[Gunnar Wrobel]

 kolab-webclient/turba/ChangeLog                                           |    7 +++++++
 kolab-webclient/turba/configuration/turba-2.3.5/10-kolab_sources_base.php |    1 +
 kolab-webclient/turba/turba.spec                                          |    2 +-
 release-notes.txt                                                         |    5 +++++
 4 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit eb0c012e9131ac30fc3ecf44f78a1d06c019f4b1
Author: Gunnar Wrobel <p at rdus.de>
Date:   Mon Sep 12 07:40:51 2011 +0000

    Display the organizationalUnit (ou) as department within the global addressbook.

diff --git a/release-notes.txt b/release-notes.txt
index 9e21ec1..ce0924a 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -27,6 +27,11 @@ the 1st.README file in the package directory.
 
 	Fix the F/B list of the organizer in the event attendee view.
 
+    - turba-2.3.5-20110912
+
+	Display the organizationalUnit (ou) as "department" within the
+	global addressbook.
+
     - Kolab_FreeBusy-0.5.2-20110826
 
 	kolab/issue4765 (Freebusy trigger fails if using localpart of user)


commit eaad77c690cd992b2ccc9dbd9c73ca6276092a94
Author: Gunnar Wrobel <p at rdus.de>
Date:   Mon Sep 12 07:40:47 2011 +0000

    Display the organizationalUnit (ou) as department within the global addressbook.

diff --git a/kolab-webclient/turba/ChangeLog b/kolab-webclient/turba/ChangeLog
index a724f3c..0a485a0 100644
--- a/kolab-webclient/turba/ChangeLog
+++ b/kolab-webclient/turba/ChangeLog
@@ -1,3 +1,10 @@
+2011-09-12  Gunnar Wrobel  <p at rdus.de>
+
+	* configuration/turba-2.3.5/10-kolab_sources_base.php:
+
+	Display the organizationalUnit (ou) as "department" within the
+	global addressbook.
+
 2010-06-07  Gunnar Wrobel  <p at rdus.de>
 
 	* patches/turba-2.3.3/t_turba_HK_GW_ZpushAnnotations.diff:
diff --git a/kolab-webclient/turba/configuration/turba-2.3.5/10-kolab_sources_base.php b/kolab-webclient/turba/configuration/turba-2.3.5/10-kolab_sources_base.php
index 61c580b..6a416b0 100644
--- a/kolab-webclient/turba/configuration/turba-2.3.5/10-kolab_sources_base.php
+++ b/kolab-webclient/turba/configuration/turba-2.3.5/10-kolab_sources_base.php
@@ -44,6 +44,7 @@ $cfgSources = array();
                 'alias'             => 'alias',
                 'title'             => 'title',
                 'company'           => 'o',
+                'department'        => 'ou',
                 'workStreet'        => 'street',
                 'workCity'          => 'l',
                 'workProvince'      => 'st',
diff --git a/kolab-webclient/turba/turba.spec b/kolab-webclient/turba/turba.spec
index 65e3b00..dea039f 100644
--- a/kolab-webclient/turba/turba.spec
+++ b/kolab-webclient/turba/turba.spec
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package turba
 %define         V_version 2.3.5
-%define         V_release 20101126
+%define         V_release 20110912
 
 # Package Information
 Name:		%{V_package}