gunnar: server/php-kolab/Kolab_Filter revert_issue2495.patch, NONE, 1.1.2.1 Makefile, 1.8.2.9, 1.8.2.10 ChangeLog, 1.29.2.8, 1.29.2.9 Kolab_Filter.spec, 1.19.2.11, 1.19.2.12

cvs at kolab.org cvs at kolab.org
Mon Nov 16 11:50:03 CET 2009


Author: gunnar

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile ChangeLog Kolab_Filter.spec 
Added Files:
      Tag: kolab_2_2_branch
	revert_issue2495.patch 
Log Message:
        kolab/issue2495 (The reply to an invitation with umlauts of a
                         group account doesn't display the umlauts.)
        kolab/issue2499 (Notification messages by the resource manager
                         should be localized)
        kolab/issue2544 (Encoding problem in cancelled appointments)


--- NEW FILE: revert_issue2495.patch ---
diff -u -B -r1.15.2.7 Resource.php
--- Kolab_Filter/lib/Horde/Kolab/Resource.php	22 Sep 2009 16:29:55 -0000	1.15.2.7
+++ Kolab_Filter/lib/Horde/Kolab/Resource.php	16 Nov 2009 10:15:24 -0000
@@ -675,11 +675,6 @@
             Horde::logMessage(sprintf('Removing event %s', $uid),
                               __FILE__, __LINE__, PEAR_LOG_INFO);
 
-            /* Ensure that $summary is single byte here, else we get
-             * problems with sprintf()
-             */
-            $summary = String::convertCharset($summary, 'utf-8', 'iso-8859-1');
-
             if (!$data->objectUidExists($uid)) {
                 Horde::logMessage(sprintf('Canceled event %s is not present in %s\'s calendar',
                                           $uid, $resource),
@@ -709,10 +704,6 @@
                 $subject = sprintf(_("%s has been cancelled"), $summary);
             }
 
-            /* Switch back to utf-8 */
-            $body = String::convertCharset($body, 'iso-8859-1');
-            $subject = String::convertCharset($subject, 'iso-8859-1');
-
             Horde::logMessage(sprintf('Sending confirmation of cancelation to %s', $organiser),
                               __FILE__, __LINE__, PEAR_LOG_WARNING);
 

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Makefile,v
retrieving revision 1.8.2.9
retrieving revision 1.8.2.10
diff -u -d -r1.8.2.9 -r1.8.2.10
--- Makefile	9 Nov 2009 17:08:45 -0000	1.8.2.9
+++ Makefile	16 Nov 2009 10:50:01 -0000	1.8.2.10
@@ -6,7 +6,7 @@
 
 SOURCE_URL=http://pear.horde.org/get
 SOURCE_0=$(PACKAGE)-$(VERSION).tgz
-EXTRA=ChangeLog issue3521.patch issue2499_2.patch issue3435.patch issue3192.patch issue3441.patch issue3558.patch issue3568.patch issue3868.patch dovecotlda-quoting.patch package.xml
+EXTRA=ChangeLog issue3521.patch revert_issue2495.patch issue2499_2.patch issue3435.patch issue3192.patch issue3441.patch issue3558.patch issue3568.patch issue3868.patch dovecotlda-quoting.patch package.xml
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.29.2.8
retrieving revision 1.29.2.9
diff -u -d -r1.29.2.8 -r1.29.2.9
--- ChangeLog	7 Nov 2009 20:46:38 -0000	1.29.2.8
+++ ChangeLog	16 Nov 2009 10:50:01 -0000	1.29.2.9
@@ -1,3 +1,13 @@
+2009-11-16  Gunnar Wrobel  <p at rdus.de>
+
+	* Kolab_Filter.spec: kolab/issue2499 (Notification messages by the
+	resource manager should be localized)
+
+	kolab/issue2495 (The reply to an invitation with umlauts of a
+	group account doesn't display the umlauts.)
+
+	kolab/issue2544 (Encoding problem in cancelled appointments)
+	
 2009-11-07  Gunnar Wrobel  <p at rdus.de>
 
 	* Kolab_Filter.spec: kolab/issue2499 (Notification messages by the

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.19.2.11
retrieving revision 1.19.2.12
diff -u -d -r1.19.2.11 -r1.19.2.12
--- Kolab_Filter.spec	7 Nov 2009 20:46:38 -0000	1.19.2.11
+++ Kolab_Filter.spec	16 Nov 2009 10:50:01 -0000	1.19.2.12
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_Filter
 %define         V_version 0.1.4
-%define         V_release 20091107
+%define         V_release 20091116
 
 # Package Information
 Name:	   %{V_package}
@@ -28,6 +28,7 @@
 Patch6:    issue3558.patch
 Patch7:    issue3568.patch
 Patch8:    issue3868.patch
+Patch9:    revert_issue2495.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -71,6 +72,7 @@
 	%patch -p1 -P 6
 	%patch -p1 -P 7
 	%patch -p1 -P 8
+	%patch -p1 -P 9
 	cp %{S:1} .
 %build
 





More information about the commits mailing list