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

Git Service User git at kolabsys.com
Sun Apr 10 23:03:41 CEST 2011


 kolab-webclient/ingo/ChangeLog                                                  |    9 +++
 kolab-webclient/ingo/ingo.spec                                                  |    2 
 kolab-webclient/ingo/patches/ingo-1.2.5/series                                  |    1 
 kolab-webclient/ingo/patches/ingo-1.2.5/t_ingo_HK_GW_ConfigurationOverride.diff |   30 ++++++++++
 release-notes.txt                                                               |    8 ++
 5 files changed, 49 insertions(+), 1 deletion(-)

New commits:
commit a02ad68d57fac8d98d5b51ae5d7fb9fad151a8f6
Author: Gunnar Wrobel <p at rdus.de>
Date:   Tue Jan 11 13:53:28 2011 +0000

    Ensure the backend override configuration gets applied.
    
            kolab/issue4684 (No options in webclient -> Options -> Filters)
            kolab/issue4683 (Forwards and spamfilter missing from filters)

diff --git a/kolab-webclient/ingo/ChangeLog b/kolab-webclient/ingo/ChangeLog
index aca5694..6c00a82 100644
--- a/kolab-webclient/ingo/ChangeLog
+++ b/kolab-webclient/ingo/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-11  Gunnar Wrobel  <p at rdus.de>
+
+	* patches/ingo-1.2.5/t_ingo_HK_GW_ConfigurationOverride.diff:
+
+	Ensure the backend override configuration gets applied.
+
+	kolab/issue4684 (No options in webclient -> Options -> Filters)
+	kolab/issue4683 (Forwards and spamfilter missing from filters)
+
 2010-11-26  Gunnar Wrobel  <p at rdus.de>
 
 	* ingo.spec: Update to 1.2.5.
diff --git a/kolab-webclient/ingo/ingo.spec b/kolab-webclient/ingo/ingo.spec
index 4982242..e082c9b 100644
--- a/kolab-webclient/ingo/ingo.spec
+++ b/kolab-webclient/ingo/ingo.spec
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package ingo
 %define         V_version 1.2.5
-%define         V_release 20101126
+%define         V_release 20110111
 
 # Package Information
 Name:		%{V_package}
diff --git a/kolab-webclient/ingo/patches/ingo-1.2.5/series b/kolab-webclient/ingo/patches/ingo-1.2.5/series
new file mode 100644
index 0000000..c877d38
--- /dev/null
+++ b/kolab-webclient/ingo/patches/ingo-1.2.5/series
@@ -0,0 +1 @@
+t_ingo_HK_GW_ConfigurationOverride.diff
diff --git a/kolab-webclient/ingo/patches/ingo-1.2.5/t_ingo_HK_GW_ConfigurationOverride.diff b/kolab-webclient/ingo/patches/ingo-1.2.5/t_ingo_HK_GW_ConfigurationOverride.diff
new file mode 100644
index 0000000..940423b
--- /dev/null
+++ b/kolab-webclient/ingo/patches/ingo-1.2.5/t_ingo_HK_GW_ConfigurationOverride.diff
@@ -0,0 +1,30 @@
+From: Gunnar Wrobel <p at rdus.de>
+Subject: [PATCH] t/ingo/HK/GW/ConfigurationOverride
+
+Allow overriding configuration defaults.
+
+STATUS: HACK
+
+Signed-off-by: Gunnar Wrobel <p at rdus.de>
+
+---
+
+--- a/config/backends.php.dist	2009-08-05 23:06:10.000000000 +0200
++++ b/config/backends.php.dist	2010-03-09 22:21:04.000000000 +0100
+@@ -332,3 +332,16 @@
+         'shares' => false
+     );
+ }
++
++ // Load global configuration stanzas in .d directory
++ $directory = dirname(__FILE__) . '/backends.d';
++ if (file_exists($directory) && is_dir($directory)) {
++     $sub_files = glob("$directory/*.php");
++     if ($sub_files) {
++         foreach ($sub_files as $sub_file) {
++             ob_start();
++             $success = include $sub_file;
++             $output = ob_get_clean();
++         }
++     }
++ }
diff --git a/release-notes.txt b/release-notes.txt
index 2002229..38ec3e2 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -6,6 +6,14 @@ For upgrading and installation instructions, please refer to
 the 1st.README file in the package directory.
 
 
+Changes between 2.3-alpha and 2.3-?:
+
+    - ingo-1.2.5-20110111
+
+	kolab/issue4684 (No options in webclient -> Options -> Filters)
+	kolab/issue4683 (Forwards and spamfilter missing from filters)
+
+
 Changes between 2.2.4 and 2.3-alpha:
 
     - apache-2.2.17-20100406





More information about the commits mailing list