[ooo-build-commit] .: patches/dev300

[René Engelhard]

 patches/dev300/apply |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 05793e20a168e2130494733b0305219f870ca836
Author: Rene Engelhard <rene at debian.org>
Date:   Fri May 21 20:41:25 2010 +0200

    fix Debian/Ark/Pardus build for now
    
    * patches/dev300/apply: temporarily disable sensible-ooomua.diff and
      *-ExternalMailer.diff as there's already a ExternalMailer there and
      the format changed.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index e467121..57f7aa0 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1280,7 +1280,7 @@ sfx2-template-category-labels.diff, pmladek
 scp2_add_additional_dirs.diff, kami
 
 [ DebianBaseOnly ]
-sensible-ooomua.diff
+# FIXME dev300-m77 sensible-ooomua.diff
 sensible-browser.diff
 
 [ BuildBits ]
@@ -2203,7 +2203,7 @@ SectionOwner => brosenk
 
 # We use KMail...
 # There's no point in upstreaming this because not everyone uses KMail.
-ark-default-ExternalMailer.diff
+# FIXME dev300-m77 ark-default-ExternalMailer.diff
 
 [ ArkOnlyExperimental ]
 # There's no point in upstreaming this because it relies on the Ark
@@ -2397,7 +2397,7 @@ sfx2-global-scope-fix.diff, thorsten
 cws-kohei03-sc-macfix.diff, thorsten
 
 [ PardusOnly ]
-pardus-default-ExternalMailer.diff
+# FIXME dev300-m77 pardus-default-ExternalMailer.diff
 pardus-clipart.diff
 dont-check-fqdn.diff