ooo-build r13964 - in trunk: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Fri Sep 19 13:49:14 2008
New Revision: 13964
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13964&view=rev

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

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


Added:
   trunk/patches/dev300/lucene-no-java.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Sep 19 13:49:14 2008
@@ -1187,6 +1187,9 @@
 # do not pack any potential .orig files with ppds
 psprint_config-no-orig.diff, jholesov
 
+[ BuildBits < ooo300-m7 ]
+lucene-no-java.diff
+
 [ DebianOnly ]
 seamonkey-is-iceape.diff
 

Added: trunk/patches/dev300/lucene-no-java.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/lucene-no-java.diff	Fri Sep 19 13:49:14 2008
@@ -0,0 +1,31 @@
+Index: makefile.mk
+===================================================================
+RCS file: /cvs/external/lucene/makefile.mk,v
+retrieving revision 1.3.2.1
+diff -u -r1.3.2.1 makefile.mk
+--- lucene/makefile.mk	31 Jul 2008 20:07:34 -0000	1.3.2.1
++++ lucene/makefile.mk	19 Sep 2008 11:23:37 -0000
+@@ -41,6 +41,8 @@
+ .INCLUDE :	antsettings.mk
+ # --- Files --------------------------------------------------------
+ 
++.IF "$(SOLAR_JAVA)" != ""
++
+ LUCENE_MAJOR=2
+ LUCENE_MINOR=3
+ LUCENE_MICRO=2
+@@ -58,9 +60,13 @@
+ 
+ OUT2BIN=.$/build$/$(LUCENE_CORE_JAR) .$/build$/contrib$/analyzers$/$(LUCENE_ANALYZERS_JAR)
+ 
++.ENDIF
++
+ # --- Targets ------------------------------------------------------
+ 
+ .INCLUDE : set_ext.mk
+ .INCLUDE : target.mk
+-.INCLUDE : tg_ext.mk 
+ 
++.IF "$(SOLAR_JAVA)" != ""
++.INCLUDE : tg_ext.mk 
++.ENDIF