On Wed, Jul 23, 2003 at 05:10:32PM +0200, Jérôme Warnier wrote: > I'm looking for the moment at http://ooo.ximian.com/patches/RC3/. > It seems some of the patches there would be really interesting to modify > then include. That would be great if you have time to look at this for us. > I think more precisely to desktop-integration.diff for the moment. It > should not be too hard to adapt to Debian/plain GNOME/whatever. > I can see some work has already be done for KDE (KMail for example). > Where can I find this? We haven't done any work on it - it is all upstream's changes. Take a look at the desktop-integration diff to see which files are affected. > Could some of you tell me also what format you'd accept from me and how > to get it (I expect someting like "diff -u", nothing else)? Almost, but not quite :( the same format as michael's patches. Our patches include an extra directory name at the front of the patch. So for example you'd have to change this: --- officecfg/registry/data/org/openoffice/Office/Common.xcu 8 Apr 2003 15:55:00 -0000 1.10 +++ officecfg/registry/data/org/openoffice/Office/Common.xcu 20 May 2003 10:54:34 -0000 to this: --- openoffice/officecfg/registry/data/org/openoffice/Office/Common.xcu 8 Apr 2003 15:55:00 -0000 1.10 +++ openoffice/officecfg/registry/data/org/openoffice/Office/Common.xcu 20 May 2003 10:54:34 -0000 Take a look at the existing patches in debian/patches to see the format. You can test them out by running the debian/scrtips/patch.apply and debian/scripts/patch.unapply scripts. I won't accept any patches for the rc1 packages because they are frozen until upload. The next packages will probably be taken from the rc3 branch. Chris
Attachment:
pgphL21TQWGe0.pgp
Description: PGP signature