Branch '2.3-stable' - kolab-webclient/horde release-notes.txt

Gunnar Wrobel wrobel at kolabsys.com
Wed Aug 24 07:08:01 CEST 2011


 kolab-webclient/horde/ChangeLog                           |    6 ++++++
 kolab-webclient/horde/configuration/horde-3.3.11/conf.php |    2 +-
 kolab-webclient/horde/horde.spec                          |    2 +-
 release-notes.txt                                         |    4 ++++
 4 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit f9968f8b3ace85f4c50e356a7a722d1549c7c0d4
Author: Gunnar Wrobel <p at rdus.de>
Date:   Wed Aug 24 05:07:43 2011 +0000

    kolab/issue4739 (Webmail problems with attachments in kolab-2.3.1)
    
    The Kolab PHP binary already comes with GD support which we can use for image manipulation. So there is no need to specify a path to Image Magick which might not be available. So we simply disable Image Magick.

diff --git a/kolab-webclient/horde/ChangeLog b/kolab-webclient/horde/ChangeLog
index a731618..b57c65c 100644
--- a/kolab-webclient/horde/ChangeLog
+++ b/kolab-webclient/horde/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-24  Gunnar Wrobel  <p at rdus.de>
+
+	* configuration/horde-3.3.11/conf.php:
+
+	kolab/issue4739 (Webmail problems with attachments in kolab-2.3.1)
+
 2010-12-02  Gunnar Wrobel  <p at rdus.de>
 
 	* templates/horde-3.3.11/webclient-kolab-conf.template:
diff --git a/kolab-webclient/horde/configuration/horde-3.3.11/conf.php b/kolab-webclient/horde/configuration/horde-3.3.11/conf.php
index bbb91cc..d64dcae 100644
--- a/kolab-webclient/horde/configuration/horde-3.3.11/conf.php
+++ b/kolab-webclient/horde/configuration/horde-3.3.11/conf.php
@@ -73,7 +73,7 @@ $conf['vfs']['params']['vfsroot'] = dirname(__FILE__) . '/../../../../webclient_
 $conf['vfs']['type'] = 'file';
 $conf['sessionhandler']['type'] = 'none';
 $conf['sessionhandler']['memcache'] = false;
-$conf['image']['convert'] = '/usr/bin/convert';
+$conf['image']['convert'] = false;
 $conf['mime']['magic_db'] = '/etc/mime.types';
 $conf['problems']['email'] = 'webmaster at example.com';
 $conf['problems']['maildomain'] = 'example.com';
diff --git a/kolab-webclient/horde/horde.spec b/kolab-webclient/horde/horde.spec
index c122b21..bb56e0b 100644
--- a/kolab-webclient/horde/horde.spec
+++ b/kolab-webclient/horde/horde.spec
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package horde
 %define         V_version 3.3.11
-%define         V_release 20101202
+%define         V_release 20110824
 
 # Package Information
 Name:		%{V_package}
diff --git a/release-notes.txt b/release-notes.txt
index 7a78c6f..0377379 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -8,6 +8,10 @@ the 1st.README file in the package directory.
 
  Changes between 2.3.2 and 2.3-?:
 
+    - horde-3.3.11-20110824
+
+	kolab/issue4739 (Webmail problems with attachments in kolab-2.3.1)
+
     - imp-4.3.9-20110111
 
 	kolab/issue4690 (Umlaut problems in system folders)





More information about the commits mailing list