ooo-build r13968 - in branches/ooo-build-3-0: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Fri Sep 19 17:08:50 2008
New Revision: 13968
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13968&view=rev

Log:
2008-09-19  Rene Engelhard  <rene debian org>

        * patches/dev300/apply,
          patches/dev300/reportdesign-useless-jfreereport-dep.diff: remove
          bogus build-dep

2008-09-19  Rene Engelhard  <rene debian org>

        * patches/dev300/apply,
          patches/dev300/lucene-no-java.diff: --without-java buildfix


Added:
   branches/ooo-build-3-0/patches/dev300/lucene-no-java.diff
      - copied unchanged from r13964, /trunk/patches/dev300/lucene-no-java.diff
   branches/ooo-build-3-0/patches/dev300/reportdesign-useless-jfreereport-dep.diff
      - copied unchanged from r13967, /trunk/patches/dev300/reportdesign-useless-jfreereport-dep.diff
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/apply

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Fri Sep 19 17:08:50 2008
@@ -356,6 +356,9 @@
 # re-direct to plugins via http://extensions.go-oo.org/
 redirect-extensions.diff
 
+[ BuildBits >= ooo300-m4 < ooo300-m7 ]
+reportdesign-useless-jfreereport-dep.diff
+
 [ FixesNotForUpstream ]
 #upload a new libwpd + fix an exception with condensed paragraphs
 libwpd.diff, fridrich
@@ -1176,6 +1179,10 @@
 # do not pack any potential .orig files with ppds
 psprint_config-no-orig.diff, jholesov
 
+[ BuildBits < ooo300-m7 ]
+reportdesign-useless-jfreereport-dep.diff
+lucene-no-java.diff
+
 [ DebianOnly ]
 seamonkey-is-iceape.diff