Branch '2.3-stable' - pear/Kolab_Resource release-notes.txt

[Christoph Wickert]

 pear/Kolab_Resource/ChangeLog                                                  |    7 +++
 pear/Kolab_Resource/package.info                                               |    2 -
 pear/Kolab_Resource/patches/Kolab_Resource-0.1.2/Kolab_Resource_0.1.2_p1.patch |   20 ++++++++++
 release-notes.txt                                                              |    4 ++
 4 files changed, 32 insertions(+), 1 deletion(-)

New commits:
commit 03255716ebe68a134d0c5ac92c7168c70d4a2f74
Author: Gunnar Wrobel <p at rdus.de>
Date:   Tue May 10 04:59:07 2011 +0000

    kolab/issue4731 (answer from resources contains extra \r\n\r\n characters (not return/newline))

diff --git a/pear/Kolab_Resource/ChangeLog b/pear/Kolab_Resource/ChangeLog
index 67149d8..4c59628 100644
--- a/pear/Kolab_Resource/ChangeLog
+++ b/pear/Kolab_Resource/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-10  Gunnar Wrobel  <p at rdus.de>
+
+	* patches/Kolab_Resource-0.1.2/Kolab_Resource_0.1.2_p1.patch:
+
+	kolab/issue4731 (answer from resources contains extra "\r\n\r\n"
+	characters (not return/newline!))
+
 2010-07-25  Gunnar Wrobel  <p at rdus.de>
 
 	* package.info:
diff --git a/pear/Kolab_Resource/package.info b/pear/Kolab_Resource/package.info
index e0b62cd..cdb3c19 100644
--- a/pear/Kolab_Resource/package.info
+++ b/pear/Kolab_Resource/package.info
@@ -16,7 +16,7 @@ package_origin='WGET'
 version='0.1.2'
 
 # Package release number
-release='20100920'
+release='20110510'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/server/development-2.3/externals'
diff --git a/pear/Kolab_Resource/patches/Kolab_Resource-0.1.2/Kolab_Resource_0.1.2_p1.patch b/pear/Kolab_Resource/patches/Kolab_Resource-0.1.2/Kolab_Resource_0.1.2_p1.patch
new file mode 100644
index 0000000..c42bc52
--- /dev/null
+++ b/pear/Kolab_Resource/patches/Kolab_Resource-0.1.2/Kolab_Resource_0.1.2_p1.patch
@@ -0,0 +1,20 @@
+From: Gunnar Wrobel <wrobel at pardus.de>
+Subject: [PATCH] Kolab_Resource_0.1.2_p1.patch
+
+kolab/issue4731 (answer from resources contains extra "\r\n\r\n" characters (not return/newline!))
+
+STATUS: MERGED
+
+Signed-off-by: Gunnar Wrobel <wrobel at pardus.de>
+
+--- a/framework/Kolab_Resource/lib/Horde/Kolab/Resource/Reply.php	7 Jul 2010 07:07:25 -0000	1.1.2.1
++++ b/framework/Kolab_Resource/lib/Horde/Kolab/Resource/Reply.php	10 May 2011 04:50:02 -0000
+@@ -85,6 +85,6 @@
+
+     public function getData()
+     {
+-        return $this->_headers->toString() . '\r\n\r\n' . $this->_body->toString();
++        return $this->_headers->toString() . $this->_body->toString();
+     }
+ }
+\ No newline at end of file
diff --git a/release-notes.txt b/release-notes.txt
index a073a56..bcd8d78 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -12,6 +12,10 @@ Changes between 2.3.1 and 2.3.?:
 
 	kolab/issue4730 (generating free/busy cache broken in server 2.3.0)
 
+    - Kolab_Resource-0.1.2-20110510
+
+	kolab/issue4731 (answer from resources contains extra "\r\n\r\n"
+	characters (not return/newline!))
 
 Changes between 2.3.0 and 2.3.1: