gunnar: server/patches/horde-webmail/1.2.0 Makefile, 1.2, 1.3 horde-webmail-1.2.0_kolab_openpkg.patch, 1.32, 1.33
cvs at kolab.org
cvs at kolab.org
Sun Mar 8 22:04:50 CET 2009
- Previous message: gunnar: server/patches/horde-webmail/1.2.0/tg t_COPYRIGHT.diff, NONE, 1.1 t_COPYRIGHT2.diff, NONE, 1.1 t_COPYRIGHT3.diff, NONE, 1.1 t_KOLAB.diff, NONE, 1.1 t_Kolab__Server_HK_GW_FixAddrForIdOrMail.diff, NONE, 1.1 t_Kolab__Server_HK_GW_FixLowerCaseObjectClasses.diff, NONE, 1.1 t_Kolab__Server_HK_GW_FixNotics.diff, NONE, 1.1 t_Kolab__Storage_HK_GW_MultipleListCaches.diff, NONE, 1.1 t_Kolab__Storage_HK_GW_SuppressTriggering.diff, NONE, 1.1 t_imp_H_GW_DefaultLoginView.diff, NONE, 1.1 t_imp_H_GW_LoginRetries.diff, NONE, 1.1 t_imp_H_JS_bug7739.diff, NONE, 1.1 t_imp_H_MS_bug7438.diff, NONE, 1.1 series, 1.5, 1.6
- Next message: gunnar: server/kolab-webclient kolab-webclient.spec,1.23,1.24
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: gunnar
Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv16816
Modified Files:
Makefile horde-webmail-1.2.0_kolab_openpkg.patch
Log Message:
Update from the kolab-webclient branch.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 20 Feb 2009 10:19:09 -0000 1.2
+++ Makefile 8 Mar 2009 21:04:44 -0000 1.3
@@ -2,7 +2,7 @@
make patch:
touch $(HORDE).1
- for PATCH in `cat tg/series | sed -e 's/-p1//' `; \
+ for PATCH in `cat tg/series | grep -v t_KOLAB | sed -e 's/-p1//' `; \
do \
cat tg/$$PATCH >> $(HORDE).1; \
done
Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- horde-webmail-1.2.0_kolab_openpkg.patch 26 Feb 2009 16:47:48 -0000 1.32
+++ horde-webmail-1.2.0_kolab_openpkg.patch 8 Mar 2009 21:04:44 -0000 1.33
@@ -1,4 +1,5434 @@
From: Gunnar Wrobel <p at rdus.de>
+Subject: [PATCH] t/SyncML/HK/GW/CombinedFixes
+
+Combined set of Univention SyncML patches.
+
+FIXME: At least one of these has been rejected upstream. Rework the patch and update this one. Actually this patch should be
+splitted into the single parts.
+
+Signed-off-by: Gunnar Wrobel <p at rdus.de>
+
+---
[...22514 lines suppressed...]
- ),
- 'search' => array(
- 'name',
-diff --git a/turba/lib/Driver.php b/turba/lib/Object.php
-index 09a09a8..db746d2 100644
---- a/horde-webmail/turba/lib/Object.php
-+++ b/horde-webmail/turba/lib/Object.php
-@@ -115,7 +115,11 @@
- is_array($this->driver->map[$attribute])) {
- $args = array();
- foreach ($this->driver->map[$attribute]['fields'] as $field) {
-- $args[] = $this->getValue($field);
-+ $value = $this->getValue($field);
-+ if (empty($value) && isset($this->driver->map[$attribute]['defaults'][$field])) {
-+ $value = $this->driver->map[$attribute]['defaults'][$field];
-+ }
-+ $args[] = $value;
- }
- return trim(vsprintf($this->driver->map[$attribute]['format'], $args), " \t\n\r\0\x0B,");
- } elseif (!isset($this->attributes[$attribute])) {
- Previous message: gunnar: server/patches/horde-webmail/1.2.0/tg t_COPYRIGHT.diff, NONE, 1.1 t_COPYRIGHT2.diff, NONE, 1.1 t_COPYRIGHT3.diff, NONE, 1.1 t_KOLAB.diff, NONE, 1.1 t_Kolab__Server_HK_GW_FixAddrForIdOrMail.diff, NONE, 1.1 t_Kolab__Server_HK_GW_FixLowerCaseObjectClasses.diff, NONE, 1.1 t_Kolab__Server_HK_GW_FixNotics.diff, NONE, 1.1 t_Kolab__Storage_HK_GW_MultipleListCaches.diff, NONE, 1.1 t_Kolab__Storage_HK_GW_SuppressTriggering.diff, NONE, 1.1 t_imp_H_GW_DefaultLoginView.diff, NONE, 1.1 t_imp_H_GW_LoginRetries.diff, NONE, 1.1 t_imp_H_JS_bug7739.diff, NONE, 1.1 t_imp_H_MS_bug7438.diff, NONE, 1.1 series, 1.5, 1.6
- Next message: gunnar: server/kolab-webclient kolab-webclient.spec,1.23,1.24
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list