gunnar: server/php-kolab/Kolab_Filter issue3966.patch, NONE, 1.1.2.1 ChangeLog, 1.29.2.14, 1.29.2.15 Kolab_Filter.spec, 1.19.2.18, 1.19.2.19 Makefile, 1.8.2.16, 1.8.2.17

cvs at kolab.org cvs at kolab.org
Thu Jun 24 20:57:22 CEST 2010


Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv11872/d/Kolab_Filter

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog Kolab_Filter.spec Makefile 
Added Files:
      Tag: kolab_2_2_branch
	issue3966.patch 
Log Message:
kolab/issue3966 (All day event with not booked not correctly processed) 

--- NEW FILE: issue3966.patch ---
diff -u -B -r1.15.2.3 -r1.15.2.4
--- a/lib/Horde/Kolab/Resource.php	5 Mar 2009 10:08:53 -0000	1.15.2.3
+++ b/lib/Horde/Kolab/Resource.php	6 Mar 2009 08:43:12 -0000	1.15.2.4
@@ -249,9 +249,6 @@
         }
         $object['start-date'] = $this->convert2epoch($itip->getAttributeDefault('DTSTART', ''));
         $object['end-date'] = $this->convert2epoch($dtend);
-        if ($itip->getAttributeDefault('TRANSP', 'OPAQUE') == 'TRANSPARENT') {
-            $object['show-time-as'] = $itip->getAttributeDefault('DTEND', '');
-        }
 
         $attendees = $itip->getAttribute('ATTENDEE');
         if (!is_a( $attendees, 'PEAR_Error')) {

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.29.2.14
retrieving revision 1.29.2.15
diff -u -d -r1.29.2.14 -r1.29.2.15
--- ChangeLog	25 Nov 2009 13:42:20 -0000	1.29.2.14
+++ ChangeLog	24 Jun 2010 18:57:20 -0000	1.29.2.15
@@ -1,9 +1,16 @@
+2010-06-24  Gunnar Wrobel  <p at rdus.de>
+
+	* issue3966.patch, Kolab_Filter.spec:
+
+	kolab/issue3966 (All day event with "not booked" not correctly
+	processed)
+
 2009-11-25  Sascha Wilde  <wilde at intevation.de>
 
 	* Kolab_Filter.spec: kolab/issue973 (Rewritten from shown
 	inconveniently in kontact)
 
-2009-11-24  root  <Gunnar Wrobel <wrobel at pardus.de>>
+2009-11-24  Gunnar Wrobel  <p at rdus.de>
 
 	* Kolab_Filter.spec: kolab/issue3594 (Mail containing NUL byte not
 	delivered, Kolab Filter does not report lmtp error)

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.19.2.18
retrieving revision 1.19.2.19
diff -u -d -r1.19.2.18 -r1.19.2.19
--- Kolab_Filter.spec	3 Dec 2009 14:11:01 -0000	1.19.2.18
+++ Kolab_Filter.spec	24 Jun 2010 18:57:20 -0000	1.19.2.19
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_Filter
 %define         V_version 0.1.4
-%define         V_release 20091203
+%define         V_release 20100624
 
 # Package Information
 Name:	   %{V_package}
@@ -35,6 +35,7 @@
 Patch13:   issue3594.patch
 Patch14:   issue973.patch
 Patch15:   issue3965.patch
+Patch16:   issue3966.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -85,6 +86,7 @@
 	%patch -p1 -P 13
 	%patch -p1 -P 14
 	%patch -p1 -P 15
+	%patch -p1 -P 16
 	cp %{S:1} .
 %build
 

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Makefile,v
retrieving revision 1.8.2.16
retrieving revision 1.8.2.17
diff -u -d -r1.8.2.16 -r1.8.2.17
--- Makefile	3 Dec 2009 14:11:01 -0000	1.8.2.16
+++ Makefile	24 Jun 2010 18:57:20 -0000	1.8.2.17
@@ -6,7 +6,7 @@
 
 SOURCE_URL=http://pear.horde.org/get
 SOURCE_0=$(PACKAGE)-$(VERSION).tgz
-EXTRA=ChangeLog revert_issue2495.patch issue2499_2.patch issue3435.patch issue3192.patch issue3441.patch issue3464.patch issue3521.patch issue3558.patch issue3568.patch issue3594.patch issue3610.patch issue3768.patch issue3868.patch issue3965.patch issue973.patch dovecotlda-quoting.patch package.xml
+EXTRA=ChangeLog revert_issue2495.patch issue2499_2.patch issue3435.patch issue3192.patch issue3441.patch issue3464.patch issue3521.patch issue3558.patch issue3568.patch issue3594.patch issue3610.patch issue3768.patch issue3868.patch issue3965.patch issue3966.patch issue973.patch dovecotlda-quoting.patch package.xml
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm





More information about the commits mailing list