summaryrefslogtreecommitdiff
path: root/nlpsolver
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.cz>2010-10-05 20:11:08 +0200
committerPetr Mladek <pmladek@suse.cz>2010-10-05 20:11:08 +0200
commitdf4931e18fb3dd6d95308858a396d52b32854472 (patch)
tree2c99e5eb8ad55bda91381aeb5d78f610eb834041 /nlpsolver
parentda0276bc889dea2710abb99d8862c0763d35d8dc (diff)
fix nlpsolver/nlpsolver-0.9.patch to apply
there are needed DOS end of lines for some files
Diffstat (limited to 'nlpsolver')
-rw-r--r--nlpsolver/nlpsolver-0.9.patch40
1 files changed, 20 insertions, 20 deletions
diff --git a/nlpsolver/nlpsolver-0.9.patch b/nlpsolver/nlpsolver-0.9.patch
index 0c851bfb8382..4e7208f4ab11 100644
--- a/nlpsolver/nlpsolver-0.9.patch
+++ b/nlpsolver/nlpsolver-0.9.patch
@@ -12,29 +12,29 @@
--- misc/nlpsolver-0.9/nbproject/project.properties.old 2009-03-30 18:32:00.000000000 +0200
+++ misc/build/nlpsolver-0.9/nbproject/project.properties 2009-10-28 18:09:01.000000000 +0100
@@ -27,8 +27,10 @@ file.reference.EvolutionarySolver.jar=Th
- includes=**
- jar.compress=false
- javac.classpath=\
-- ${libs.StarOffice 9.classpath}:\
-- ${libs.OpenOffice.org 3.0.classpath}:\
-+ ${solar.jar}/juh.jar:\
-+ ${solar.jar}/jurt.jar:\
-+ ${solar.jar}/ridl.jar:\
-+ ${solar.jar}/unoil.jar:\
- ${reference.EvolutionarySolver.jar}
- # Space-separated list of extra javac options
- javac.compilerargs=
+ includes=**
+ jar.compress=false
+ javac.classpath=\
+- ${libs.StarOffice 9.classpath}:\
+- ${libs.OpenOffice.org 3.0.classpath}:\
++ ${solar.jar}/juh.jar:\
++ ${solar.jar}/jurt.jar:\
++ ${solar.jar}/ridl.jar:\
++ ${solar.jar}/unoil.jar:\
+ ${reference.EvolutionarySolver.jar}
+ # Space-separated list of extra javac options
+ javac.compilerargs=
--- misc/nlpsolver-0.9/nbproject/build-impl.xml.old 2009-03-30 18:32:00.000000000 +0200
+++ misc/build/nlpsolver-0.9/nbproject/build-impl.xml 2009-10-28 18:19:53.000000000 +0100
@@ -360,6 +360,8 @@ is divided into following sections:
- -->
- <target depends="init" name="deps-jar" unless="no.deps">
- <ant antfile="${project.EvolutionarySolver}/build.xml" inheritall="false" target="jar"/>
-+ <mkdir dir="${dist.dir}/${external.jar.dir}"/>
-+ <copy file="${reference.EvolutionarySolver.jar}" todir="${dist.dir}/${external.jar.dir}"/>
- </target>
- <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
- <target depends="init" name="-check-automatic-build">
+ -->
+ <target depends="init" name="deps-jar" unless="no.deps">
+ <ant antfile="${project.EvolutionarySolver}/build.xml" inheritall="false" target="jar"/>
++ <mkdir dir="${dist.dir}/${external.jar.dir}"/>
++ <copy file="${reference.EvolutionarySolver.jar}" todir="${dist.dir}/${external.jar.dir}"/>
+ </target>
+ <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
+ <target depends="init" name="-check-automatic-build">
--- misc/nlpsolver-0.9/src/description.xml.old 2009-03-30 16:56:42.000000000 +0200
+++ misc/build/nlpsolver-0.9/src/description.xml 2009-10-28 18:29:13.000000000 +0100
@@ -12,11 +12,6 @@