[ooo-build-commit] 2 commits - patches/dev300

[René Engelhard]

 patches/dev300/apply |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 12c77f20abf6fba9cb41c724e25877f2532a119a
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Nov 12 18:09:12 2009 +0100

    apply xulrunner-1.9.1.diff for DebianOnly, too

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5493471..17da882 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1602,6 +1602,9 @@ SectionOwner => rengelha
 disable-helpcontent2.diff
 disable-xmlsearch-and-xmlhelp-jar.diff
 
+[ DebianOnly ]
+# build against xulrunner 1.9.1+
+xulrunner-1.9.1.diff, ccheney
 
 [ Mono ]
 SectionOwner => rodo
commit 215adf30e357bf6f4e94878e73e1dfd877e21e98
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Nov 10 15:10:31 2009 +0100

    fix/update some version conditionals

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3c3f7b1..5493471 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1140,7 +1140,7 @@ ia64-nss-m1.diff, i#105899
 # fix ia64 nss build
 ia64-nss.diff, i#105899
 
-[ BuildBits >= ooo320-m4 >= dev300-m63 ]
+[ BuildBits == ooo320-m4 < dev300-m0 ]
 # build with system neon
 system-neon-fix.diff, i#106757, rengelha
 
@@ -2146,7 +2146,7 @@ kde4-buildfix-connectivity.diff
 # needed by optional-icon-themes.diff
 kde4-oxygen-icons.diff, i#103482
 
-[ KDE4 ]
+[ KDE4 < dev300-m65 ]
 # Further fixes on top of existing kde4 support
 kde4_fpicker_fixes.diff
 kde4_vcl_fixes.diff