[Kolab-devel] Kolab-resource-handlers dependency on Horde libraries

[Gunnar Wrobel]

Steffen Hansen <steffen at klaralvdalens-datakonsult.se> writes:

> So the tasks to fix the issue would be:
>
> 1) Get your attached patch accepted upstream.
> 2) Make an OpenPKG RPM of Horde.
> 3) Re-apply your recently reverted CVS commit.
>
> Now who will take on step 1?
>

I did package the analysis I did last time into a small script so that
it should be easy to verify that indeed only two files need to be
integrated UPSTREAM.

Just put the script in an empty directory and run the analysis. I hope
it is commented well enough. It finally results in a
horde-kolab2.patch file that contains the relevant changes since
import of the horde changes.

There are some minor differences that I believe can be ignored:

PEAR package stuff:

--- framework-horde/Image/package.xml	2004-05-06 23:43:05.000000000 +0200
--- framework-horde/install-packages.php	2004-04-07 19:43:41.000000000 +0200
--- framework-horde/VC/package.xml	2004-03-06 22:16:53.000000000 +0100

Irrelevant change:

--- framework-horde/MIME/MIME/Headers.php	2004-04-14 18:59:33.000000000 +0200

Modified function not present in current Horde:

--- framework-horde/Kolab/Kolab.php	2004-05-24 15:45:04.000000000 +0200


This leaves the two files mentioned earlier:

--- framework-horde/iCalendar/iCalendar/vfreebusy.php	2004-01-01 16:14:48.000000000 +0100
--- framework-horde/iCalendar/iCalendar.php	2004-04-26 21:57:18.000000000 +0200

The vfreebusy.php patch is simple since this file has not been changed
within the horde code since the time of the import. And I belive the
changes are rather non-invasive. I attached the isolated patch and
will also submit it UPSTREAM.

Leaves the iCalendar patch but I'll tackle that later when I have more time.

Cheers

Gunnar

-- 
Gunnar Wrobel                    Gentoo Developer
__________________C_o_n_t_a_c_t__________________

Mail: wrobel at gentoo.org
WWW:  http://www.gunnarwrobel.de
IRC:  #gentoo-web at freenode.org
_________________________________________________

-------------- next part --------------
A non-text attachment was scrubbed...
Name: forensic.sh
Type: text/x-sh
Size: 2441 bytes
Desc: Analysis script
URL: <http://lists.kolab.org/pipermail/devel/attachments/20060504/8957147d/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: vfreebusy.patch
Type: text/x-patch
Size: 5189 bytes
Desc: vfreebusy.php patch
URL: <http://lists.kolab.org/pipermail/devel/attachments/20060504/8957147d/attachment-0001.bin>