gunnar: server/kolab-webclient ChangeLog, 1.10.2.4, 1.10.2.5 kolab-webclient.spec, 1.23.2.8, 1.23.2.9 webclient-kronolith-kolab-conf.template, 1.2, 1.2.2.1

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webclient
In directory doto:/tmp/cvs-serv16751/kolab-webclient

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog kolab-webclient.spec 
	webclient-kronolith-kolab-conf.template 
Log Message:
 kolab/issue3509 (calender not displaying in horde if german holidays are selected)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/ChangeLog,v
retrieving revision 1.10.2.4
retrieving revision 1.10.2.5
diff -u -d -r1.10.2.4 -r1.10.2.5
--- ChangeLog	13 May 2009 10:05:03 -0000	1.10.2.4
+++ ChangeLog	9 Sep 2009 15:02:52 -0000	1.10.2.5
@@ -1,3 +1,10 @@
+2009-09-09  Gunnar Wrobel  <p at rdus.de>
+
+	* webclient-kronolith-kolab-conf.template: 
+
+	kolab/issue3509 (calender not displaying in horde if german
+	                 holidays are selected)
+
 2009-05-13  Gunnar Wrobel  <p at rdus.de>
 
 	* kolab-webclient.spec:

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v
retrieving revision 1.23.2.8
retrieving revision 1.23.2.9
diff -u -d -r1.23.2.8 -r1.23.2.9
--- kolab-webclient.spec	14 May 2009 16:29:51 -0000	1.23.2.8
+++ kolab-webclient.spec	9 Sep 2009 15:02:52 -0000	1.23.2.9
@@ -2,8 +2,8 @@
 %define         V_horde_name horde-webmail
 %define         V_package kolab-webclient
 %define         V_year  2009
-%define         V_month 05
-%define         V_day   14
+%define         V_month 09
+%define         V_day   09
 %define         V_version 1.2.0
 %define         V_source_version 1.2
 %define         V_passwd_version 3.0.1

Index: webclient-kronolith-kolab-conf.template
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/webclient-kronolith-kolab-conf.template,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- webclient-kronolith-kolab-conf.template	7 Feb 2009 15:51:27 -0000	1.2
+++ webclient-kronolith-kolab-conf.template	9 Sep 2009 15:02:52 -0000	1.2.2.1
@@ -7,4 +7,7 @@
 $conf['storage']['default_domain'] = '@@@postfix-mydomain@@@';
 $conf['reminder']['server_name'] = '@@@fqdnhostname@@@';
 $conf['reminder']['from_addr'] = 'postmaster@@@@postfix-mydomain@@@';
+// The Holidays driver is broken in Kolab Server 2.2.2 and 2.2.3. It needs
+// some more work and has been fixed for 2.3 for that reason.
+$conf['holidays']['enable'] = false;
 ?>