[Libreoffice-commits] .: Branch 'libreoffice-3-3' - patches/dev300

[Petr Mladek]

 patches/dev300/piece-nlpsolver.diff |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c15e73158d832fa9921fd5897e90f0dc78b5e452
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Jan 7 23:05:53 2011 +0100

    fix piece-nlpsolver.diff to apply again

diff --git a/patches/dev300/piece-nlpsolver.diff b/patches/dev300/piece-nlpsolver.diff
index ff7904d..3fddb31 100644
--- a/patches/dev300/piece-nlpsolver.diff
+++ b/patches/dev300/piece-nlpsolver.diff
@@ -7,8 +7,8 @@
 -ANT_FLAGS+=-Dplatforms.JDK_1.5.home=$(JAVA_HOME) -Doffice.program.dir=$(SOLARBINDIR)
 +ANT_FLAGS+=-Dplatforms.JDK_1.5.home=$(JAVA_HOME) -Doffice.program.dir=$(SPLITINSTALLDIR)
  
- .IF "$(JAVACISGCJ)"=="yes"
- JAVA_HOME=
+ CONFIGURE_ACTION=cp -rpv ../../../../locale src/
+ 
 --- nlpsolver/nlpsolver-0.9.patch.old	2009-10-26 22:32:49.000000000 +0100
 +++ nlpsolver/nlpsolver-0.9.patch	2009-10-26 22:03:52.000000000 +0100
 @@ -17,10 +17,10 @@