gunnar: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_fbview_openpkg.patch, 1.5, 1.6 horde-webmail-1.2.0_kolab_openpkg.patch, 1.12, 1.13

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv29018/patches/horde-webmail/1.2.0

Modified Files:
	horde-webmail-1.2.0_kolab_fbview_openpkg.patch 
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
Additional fbview specific patches.

Index: horde-webmail-1.2.0_kolab_fbview_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_fbview_openpkg.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- horde-webmail-1.2.0_kolab_fbview_openpkg.patch	14 Nov 2008 11:16:11 -0000	1.5
+++ horde-webmail-1.2.0_kolab_fbview_openpkg.patch	14 Nov 2008 14:17:27 -0000	1.6
@@ -1,6 +1,6 @@
 diff -r 0a5153c325f0 config/conf.php
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/config/conf.php	Fri Nov 14 12:15:22 2008 +0100
++++ b/config/conf.php	Fri Nov 14 15:16:53 2008 +0100
 @@ -0,0 +1,118 @@
 +<?php
 +/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -122,7 +122,7 @@
 +}
 diff -r 0a5153c325f0 config/conf.xml
 --- a/config/conf.xml	Fri Nov 14 08:35:22 2008 +0100
[...1082 lines suppressed...]
                  'cellPhone'         => 'mobile',
                  'fax'               => 'fax',
@@ -12658,7 +12700,7 @@
                                     'homePostalCode', 'homeCountry', 'workStreet',
 diff -r 0a5153c325f0 turba/lib/Driver/kolab.php
 --- a/turba/lib/Driver/kolab.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/turba/lib/Driver/kolab.php	Fri Nov 14 12:15:22 2008 +0100
++++ b/turba/lib/Driver/kolab.php	Fri Nov 14 15:16:53 2008 +0100
 @@ -751,6 +751,14 @@
              if (isset($contact['email'])) {
                  unset($contact['email']);
@@ -12746,7 +12788,7 @@
          $result = $this->_store->save($attributes, $object_id);
 diff -r 0a5153c325f0 turba/lib/Object.php
 --- a/turba/lib/Object.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/turba/lib/Object.php	Fri Nov 14 12:15:22 2008 +0100
++++ b/turba/lib/Object.php	Fri Nov 14 15:16:53 2008 +0100
 @@ -249,7 +249,10 @@
       */
      function addFile($info)

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.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- horde-webmail-1.2.0_kolab_openpkg.patch	14 Nov 2008 11:16:11 -0000	1.12
+++ horde-webmail-1.2.0_kolab_openpkg.patch	14 Nov 2008 14:17:27 -0000	1.13
@@ -1,6 +1,6 @@
 diff -r 0a5153c325f0 config/conf.php
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/config/conf.php	Fri Nov 14 12:15:18 2008 +0100
++++ b/config/conf.php	Fri Nov 14 15:15:59 2008 +0100
 @@ -0,0 +1,118 @@
 +<?php
 +/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -122,7 +122,7 @@
 +}
 diff -r 0a5153c325f0 config/conf.xml
 --- a/config/conf.xml	Fri Nov 14 08:35:22 2008 +0100
[...1038 lines suppressed...]
          }
  
@@ -12656,7 +12698,7 @@
          $result = $this->_store->save($attributes, $object_id);
 diff -r 0a5153c325f0 turba/lib/Driver/share.php
 --- a/turba/lib/Driver/share.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/turba/lib/Driver/share.php	Fri Nov 14 12:15:19 2008 +0100
++++ b/turba/lib/Driver/share.php	Fri Nov 14 15:15:59 2008 +0100
 @@ -145,7 +145,7 @@
      function _deleteAll($sourceName = null)
      {
@@ -12668,7 +12710,7 @@
      }
 diff -r 0a5153c325f0 turba/lib/Object.php
 --- a/turba/lib/Object.php	Fri Nov 14 08:35:22 2008 +0100
-+++ b/turba/lib/Object.php	Fri Nov 14 12:15:19 2008 +0100
++++ b/turba/lib/Object.php	Fri Nov 14 15:15:59 2008 +0100
 @@ -249,7 +249,10 @@
       */
      function addFile($info)