[pkg-kolab] r390 - trunk/kolabd/debian

[Noel Koethe]

Author: noel
Date: 2006-06-05 13:51:36 +0000 (Mon, 05 Jun 2006)
New Revision: 390

Added:
   trunk/kolabd/debian/horde-sarge-iCal.patch
Modified:
   trunk/kolabd/debian/README.Debian
   trunk/kolabd/debian/changelog
   trunk/kolabd/debian/rules
Log:
move horde iCal patch from docu to file in the package

Modified: trunk/kolabd/debian/README.Debian
===================================================================
--- trunk/kolabd/debian/README.Debian	2006-06-02 12:59:06 UTC (rev 389)
+++ trunk/kolabd/debian/README.Debian	2006-06-05 13:51:36 UTC (rev 390)
@@ -429,38 +429,13 @@
 
 # ln -sf /usr/share/horde3/lib/Horde /usr/share/php/
 
+If you are runing horde < 3.1 (e.g. horde 3.0 in sarge) you need to
+patch an iCal file from horde.
 FreeBusy uses functions from Horde to parse the XML parts in the calendar
-emails. You need to patch this to get this runing correctly:
+emails.
 
---- /usr/share/horde3/lib/Horde/iCalendar/vfreebusy.php.orig    2005-11-22 22:51:25.000000000 +0100
-+++ /usr/share/horde3/lib/Horde/iCalendar/vfreebusy.php 2006-02-27 16:24:29.000000000 +0100
-@@ -27,16 +27,15 @@
-         parent::parsevCalendar($data, 'VFREEBUSY');
+# patch < /share/doc/kolabd/horde-sarge-iCal.patch
 
-         // Do something with all the busy periods.
--        foreach ($this->_attributes as $key => $attribute) {
-+        foreach ($this->_attributes as $attribute) {
-             if ($attribute['name'] == 'FREEBUSY') {
--                foreach ($attribute['value'] as $value) {
--                    if (array_key_exists('duration', $attribute['value'])) {
--                       $this->addBusyPeriod('BUSY', $value['start'], null, $value['duration']);
--                    } else {
--                       $this->addBusyPeriod('BUSY', $value['start'], $value['end']);
--                    }
-+               $value = $attribute['value'];
-+
-+                if (array_key_exists('duration', $attribute['value'])) {
-+                   $this->addBusyPeriod('BUSY', $value['start'], null, $value['duration']);
-+                } else {
-+                   $this->addBusyPeriod('BUSY', $value['start'], $value['end']);
-                 }
--                unset($this->_attributes[$key]);
-             }
-         }
-     }
-
-This patch will be included in coming horde versions but now you need to do it manually.:(
-
 Be sure you have the following extensions enabled in php for freebusy:
 
 /etc/php4/apache2/php.ini

Modified: trunk/kolabd/debian/changelog
===================================================================
--- trunk/kolabd/debian/changelog	2006-06-02 12:59:06 UTC (rev 389)
+++ trunk/kolabd/debian/changelog	2006-06-05 13:51:36 UTC (rev 390)
@@ -1,11 +1,16 @@
-kolabd (1.9.4dfsg-4) unstable; urgency=low
+kolabd (1.9.4dfsg-4) UNRELEASED; urgency=low
 
+  [ Steffen Jörris ]
   * Include patch to allow configuration for syslog (Closes: #368977)
     Thanks to Marc Brockschmidt
   * Add minor remind to README.Debian
 
- -- Steffen Joeris <steffen.joeris at skolelinux.de>  Fri, 26 May 2006 16:52:16 +0200
+  [ Noèl Köthe ]
+  * add horde-sarge-iCal.patch to package. Only sarge
+    horde needs it so README.Debian becomes shorter.:)
 
+ -- Noèl Köthe <noel at debian.org>  Mon, 05 Jun 2006 15:40:48 +0200
+
 kolabd (1.9.4dfsg-3) unstable; urgency=low
 
   * Fixed init script messages (closes: #360936)

Added: trunk/kolabd/debian/horde-sarge-iCal.patch
===================================================================
--- trunk/kolabd/debian/horde-sarge-iCal.patch	2006-06-02 12:59:06 UTC (rev 389)
+++ trunk/kolabd/debian/horde-sarge-iCal.patch	2006-06-05 13:51:36 UTC (rev 390)
@@ -0,0 +1,27 @@
+--- /usr/share/horde3/lib/Horde/iCalendar/vfreebusy.php.orig    2005-11-22 22:51:25.000000000 +0100
++++ /usr/share/horde3/lib/Horde/iCalendar/vfreebusy.php 2006-02-27 16:24:29.000000000 +0100
+@@ -27,16 +27,15 @@
+         parent::parsevCalendar($data, 'VFREEBUSY');
+
+         // Do something with all the busy periods.
+-        foreach ($this->_attributes as $key => $attribute) {
++        foreach ($this->_attributes as $attribute) {
+             if ($attribute['name'] == 'FREEBUSY') {
+-                foreach ($attribute['value'] as $value) {
+-                    if (array_key_exists('duration', $attribute['value'])) {
+-                       $this->addBusyPeriod('BUSY', $value['start'], null, $value['duration']);
+-                    } else {
+-                       $this->addBusyPeriod('BUSY', $value['start'], $value['end']);
+-                    }
++               $value = $attribute['value'];
++
++                if (array_key_exists('duration', $attribute['value'])) {
++                   $this->addBusyPeriod('BUSY', $value['start'], null, $value['duration']);
++                } else {
++                   $this->addBusyPeriod('BUSY', $value['start'], $value['end']);
+                 }
+-                unset($this->_attributes[$key]);
+             }
+         }
+     }
+

Modified: trunk/kolabd/debian/rules
===================================================================
--- trunk/kolabd/debian/rules	2006-06-02 12:59:06 UTC (rev 389)
+++ trunk/kolabd/debian/rules	2006-06-05 13:51:36 UTC (rev 390)
@@ -44,7 +44,10 @@
 	
 	# Template files for /etc/kolab/templates
 	for i in templates/* ; do install -D -m 644 $$i debian/kolabd/usr/share/doc/kolabd/$$i ; done
-	
+
+	# install horde-sarge-iCal.patch
+	install -D -m 644 debian/horde-sarge-iCal.patch debian/kolabd/usr/share/doc/kolabd/horde-sarge-iCal.patch
+
 	# Ldap files
 	install -D -m 644 kolab2.schema debian/kolabd/usr/share/kolabd/schema/kolab2.schema