[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit d13d4dad05eab766c297460725f06d659d643b21
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Oct 16 13:44:58 2009 +0300

    Bypass libxmlsec-findcerts.diff on ooo320-m2
    
    * patches/dev300/apply: Bypass libxmlsec-findcerts.diff on ooo320-m2
      and later. Upstream now includes libxmlsec 1.2.12. Don't know if the
      patch is needed any more. (And in any case, it would need to be
      reworked.)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index f19862a..806a7cb 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -441,9 +441,13 @@ xmlsecurity-verify-usages.diff, i#76871, pmladek
 # do not force to do it the user manually
 jvmfwk-modified-javavendors-xml.diff, i#99619, pmladek
 
+[ Fixes < ooo320-m2 ]
 # find locked certs, fix by Jacob Berkman <jberkman at novell.com>
+# FIXME: 2009-10-16: Don't know if some corresponding fix is needed
+# for the libxmlsec 1.2.12 now used in ooo320-m2. --tml
 libxmlsec-findcerts.diff, i#76870, pmladek
 
+[ Fixes ]
 # avoid error messages about missing directories with templates
 sfx2-check-existing-template-dirs.diff, i#100518, pmladek