r35248 - in /packages/scilab/trunk/debian/patches: docbook.diff jeuclid.diff series
sylvestre-guest at users.alioth.debian.org
sylvestre-guest at users.alioth.debian.org
Thu Oct 9 16:09:18 UTC 2008
Author: sylvestre-guest
Date: Thu Oct 9 16:09:17 2008
New Revision: 35248
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35248
Log:
Update of the patch to work against the version 5.0.2 and not the trunk
Added:
packages/scilab/trunk/debian/patches/docbook.diff
packages/scilab/trunk/debian/patches/jeuclid.diff
Modified:
packages/scilab/trunk/debian/patches/series
Added: packages/scilab/trunk/debian/patches/docbook.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/docbook.diff?rev=35248&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/docbook.diff (added)
+++ packages/scilab/trunk/debian/patches/docbook.diff Thu Oct 9 16:09:17 2008
@@ -1,0 +1,370 @@
+Seulement dans scilab-5.0.2/: ACKNOWLEDGEMENTS
+Seulement dans scilab-5.0.2/: aclocal.m4
+Seulement dans scilab-5.0.2/: autom4te.cache
+Seulement dans scilab-5.0.2/: bin
+Seulement dans scilab-5.0.2/: build.incl.xml
+Seulement dans scilab-5.0.2/: CHANGES
+Seulement dans scilab-5.0.2/: checkstyle
+Seulement dans scilab-5.0.2/: config
+diff -ur scilab-5.0.2.orig/configure scilab-5.0.2/configure
+--- scilab-5.0.2.orig/configure 2008-10-09 17:49:11.000000000 +0200
++++ scilab-5.0.2/configure 2008-10-09 18:02:49.000000000 +0200
+@@ -25940,13 +25940,14 @@
+ fi
+ # xml.apache.org SVG Library
+
+- { echo "$as_me:$LINENO: checking batik" >&5
+-echo $ECHO_N "checking batik... $ECHO_C" >&6; }
++
++ { echo "$as_me:$LINENO: checking batik-all" >&5
++echo $ECHO_N "checking batik-all... $ECHO_C" >&6; }
+ found_jar=no
+ saved_ac_java_classpath=$ac_java_classpath
+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java"
+ for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+- for jar in "$jardir/batik.jar" "$jardir/libbatik.jar" "$jardir/libbatik-java.jar" "$jardir/batik*.jar"; do
++ for jar in "$jardir/batik-all.jar" "$jardir/libbatik-all.jar" "$jardir/libbatik-all-java.jar" "$jardir/batik-all*.jar"; do
+ # jar=`echo $jar|sed -e 's/ /\\ /'`
+ # echo "protected $jar"
+ # jar_resolved=`ls $jar 2>/dev/null`
+@@ -25957,7 +25958,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 25960 "configure"
++// #line 25961 "configure"
+ import org.apache.batik.parser.Parser;
+
+ public class conftest {
+@@ -25998,8 +25999,8 @@
+ if test "$found_jar" = "no"; then
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+- { { echo "$as_me:$LINENO: error: Could not find or use the Java package/jar batik used by Apache SVG Library (looking for package org.apache.batik.parser.Parser)" >&5
+-echo "$as_me: error: Could not find or use the Java package/jar batik used by Apache SVG Library (looking for package org.apache.batik.parser.Parser)" >&2;}
++ { { echo "$as_me:$LINENO: error: Could not find or use the Java package/jar batik-all used by Apache SVG Library (looking for package org.apache.batik.parser.Parser)" >&5
++echo "$as_me: error: Could not find or use the Java package/jar batik-all used by Apache SVG Library (looking for package org.apache.batik.parser.Parser)" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+@@ -26025,7 +26026,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 26028 "configure"
++// #line 26029 "configure"
+ import com.icl.saxon.Loader;
+
+ public class conftest {
+@@ -26093,7 +26094,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 26096 "configure"
++// #line 26097 "configure"
+ import org.apache.fop.pdf.PDFInfo;
+
+ public class conftest {
+@@ -26144,6 +26145,7 @@
+
+ # MathML rendering solution
+
++
+ { echo "$as_me:$LINENO: checking jeuclid-core" >&5
+ echo $ECHO_N "checking jeuclid-core... $ECHO_C" >&6; }
+ found_jar=no
+@@ -26161,8 +26163,8 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 26164 "configure"
+-import net.sourceforge.jeuclid.MathBase;
++// #line 26166 "configure"
++import net.sourceforge.jeuclid.ant.MathMLConverter;
+
+ public class conftest {
+ public static void main(String[] argv) {
+@@ -26202,8 +26204,8 @@
+ if test "$found_jar" = "no"; then
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+- { { echo "$as_me:$LINENO: error: Could not find or use the Java package/jar jeuclid-core used by MathML rendering solution (looking for package net.sourceforge.jeuclid.MathBase)" >&5
+-echo "$as_me: error: Could not find or use the Java package/jar jeuclid-core used by MathML rendering solution (looking for package net.sourceforge.jeuclid.MathBase)" >&2;}
++ { { echo "$as_me:$LINENO: error: Could not find or use the Java package/jar jeuclid-core used by MathML rendering solution (looking for package net.sourceforge.jeuclid.ant.MathMLConverter)" >&5
++echo "$as_me: error: Could not find or use the Java package/jar jeuclid-core used by MathML rendering solution (looking for package net.sourceforge.jeuclid.ant.MathMLConverter)" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+@@ -26229,7 +26231,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 26232 "configure"
++// #line 26234 "configure"
+ import org.apache.commons.io.output.CountingOutputStream;
+
+ public class conftest {
+@@ -26297,7 +26299,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 26300 "configure"
++// #line 26302 "configure"
+ import org.apache.xmlgraphics.util.Service;
+
+ public class conftest {
+@@ -26366,7 +26368,7 @@
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 26369 "configure"
++// #line 26371 "configure"
+ import org.apache.avalon.framework.configuration.ConfigurationException;
+
+ public class conftest {
+@@ -27006,7 +27008,7 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 27009 "configure"' > conftest.$ac_ext
++ echo '#line 27011 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -28876,11 +28878,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:28879: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:28881: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:28883: \$? = $ac_status" >&5
++ echo "$as_me:28885: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -29166,11 +29168,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:29169: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:29171: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:29173: \$? = $ac_status" >&5
++ echo "$as_me:29175: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -29270,11 +29272,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:29273: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:29275: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:29277: \$? = $ac_status" >&5
++ echo "$as_me:29279: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -31719,7 +31721,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 31722 "configure"
++#line 31724 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -31819,7 +31821,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 31822 "configure"
++#line 31824 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -34240,11 +34242,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:34243: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:34245: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:34247: \$? = $ac_status" >&5
++ echo "$as_me:34249: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -34344,11 +34346,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:34347: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:34349: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:34351: \$? = $ac_status" >&5
++ echo "$as_me:34353: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -35942,11 +35944,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:35945: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:35947: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:35949: \$? = $ac_status" >&5
++ echo "$as_me:35951: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -36046,11 +36048,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:36049: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:36051: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:36053: \$? = $ac_status" >&5
++ echo "$as_me:36055: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -38270,11 +38272,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:38273: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:38275: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:38277: \$? = $ac_status" >&5
++ echo "$as_me:38279: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -38560,11 +38562,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:38563: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:38565: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:38567: \$? = $ac_status" >&5
++ echo "$as_me:38569: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -38664,11 +38666,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:38667: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:38669: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:38671: \$? = $ac_status" >&5
++ echo "$as_me:38673: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+Seulement dans scilab-5.0.2/: configure.ac
+Seulement dans scilab-5.0.2/: contrib
+Seulement dans scilab-5.0.2/: COPYING
+Seulement dans scilab-5.0.2/: COPYING-FR
+Seulement dans scilab-5.0.2/: etc
+Seulement dans scilab-5.0.2/: libs
+Seulement dans scilab-5.0.2/: license.txt
+Seulement dans scilab-5.0.2/m4: argz.m4
+diff -ur scilab-5.0.2.orig/m4/docbook.m4 scilab-5.0.2/m4/docbook.m4
+--- scilab-5.0.2.orig/m4/docbook.m4 2008-10-09 17:50:37.000000000 +0200
++++ scilab-5.0.2/m4/docbook.m4 2008-10-09 18:02:28.000000000 +0200
+@@ -25,7 +25,8 @@
+ AC_MSG_ERROR([Could not find the Docbook root directory. If you have installed it on your system and we haven't been able to find it. Please report a bug])
+ fi
+ # xml.apache.org SVG Library
+- AC_JAVA_CHECK_PACKAGE([batik],[org.apache.batik.parser.Parser],[Apache SVG Library])
++
++ AC_JAVA_CHECK_PACKAGE([batik-all],[org.apache.batik.parser.Parser],[Apache SVG Library])
+ BATIK=$PACKAGE_JAR_FILE
+ AC_SUBST(BATIK)
+
+@@ -40,7 +41,8 @@
+ AC_SUBST(FOP)
+
+ # MathML rendering solution
+- AC_JAVA_CHECK_PACKAGE([jeuclid-core],[net.sourceforge.jeuclid.MathBase],[MathML rendering solution])
++
++AC_JAVA_CHECK_PACKAGE([jeuclid-core],[net.sourceforge.jeuclid.ant.MathMLConverter],[MathML rendering solution])
+ JEUCLID_CORE=$PACKAGE_JAR_FILE
+ AC_SUBST(JEUCLID_CORE)
+
+Seulement dans scilab-5.0.2/m4: fftw.m4
+Seulement dans scilab-5.0.2/m4: fortran.m4
+Seulement dans scilab-5.0.2/m4: giws.m4
+Seulement dans scilab-5.0.2/m4: intel_compiler.m4
+Seulement dans scilab-5.0.2/m4: java.m4
+Seulement dans scilab-5.0.2/m4: java.old.m4
+Seulement dans scilab-5.0.2/m4: lib-ld.m4
+Seulement dans scilab-5.0.2/m4: libs_by_debian.m4
+Seulement dans scilab-5.0.2/m4: libsmath.m4
+Seulement dans scilab-5.0.2/m4: libtool.m4
+Seulement dans scilab-5.0.2/m4: libxml2.m4
+Seulement dans scilab-5.0.2/m4: lt~obsolete.m4
+Seulement dans scilab-5.0.2/m4: ltsugar.m4
+Seulement dans scilab-5.0.2/m4: matio.m4
+Seulement dans scilab-5.0.2/m4: mpi.m4
+Seulement dans scilab-5.0.2/m4: ocaml.m4
+Seulement dans scilab-5.0.2/m4: pcre.m4
+Seulement dans scilab-5.0.2/m4: pvm.m4
+Seulement dans scilab-5.0.2/m4: relocatable.m4
+Seulement dans scilab-5.0.2/m4: swig.m4
+Seulement dans scilab-5.0.2/m4: symlinks.m4
+Seulement dans scilab-5.0.2/m4: tcltk.m4
+Seulement dans scilab-5.0.2/m4: umfpack.m4
+Seulement dans scilab-5.0.2/: Makefile.am
+Seulement dans scilab-5.0.2/: Makefile.in
+Seulement dans scilab-5.0.2/: Makefile.incl.am
+Seulement dans scilab-5.0.2/: Makefile.incl.in
+Seulement dans scilab-5.0.2/: Makefile.incl.mak
+Seulement dans scilab-5.0.2/: Makemex.in
+Seulement dans scilab-5.0.2/: modules
+Seulement dans scilab-5.0.2/: README_Unix
+Seulement dans scilab-5.0.2/: Readme_Visual.txt
+Seulement dans scilab-5.0.2/: README_Windows.txt
+Seulement dans scilab-5.0.2/: RELEASE_NOTES
+Seulement dans scilab-5.0.2/: Scilab_f2c.sln
+Seulement dans scilab-5.0.2/: scilab-lib-doc.properties.in
+Seulement dans scilab-5.0.2/: scilab-lib-doc.properties.vc
+Seulement dans scilab-5.0.2/: scilab-lib.properties.in
+Seulement dans scilab-5.0.2/: scilab-lib.properties.vc
+Seulement dans scilab-5.0.2/: scilab.pc.in
+Seulement dans scilab-5.0.2/: Scilab.sln
+Seulement dans scilab-5.0.2/: scripts
+Seulement dans scilab-5.0.2/: SVN_revision.incl
+Seulement dans scilab-5.0.2/: thirdparty
+Seulement dans scilab-5.0.2/: tools
+Seulement dans scilab-5.0.2/: Version.incl
+Seulement dans scilab-5.0.2/: Visual-Studio-settings
+Seulement dans scilab-5.0.2/: X11_defaults
Added: packages/scilab/trunk/debian/patches/jeuclid.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/jeuclid.diff?rev=35248&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/jeuclid.diff (added)
+++ packages/scilab/trunk/debian/patches/jeuclid.diff Thu Oct 9 16:09:17 2008
@@ -1,0 +1,43 @@
+--- scilab-5.0.2.orig/modules/helptools/src/java/org/scilab/modules/helptools/CopyConvert.java 2008/09/04 08:00:48 27268
++++ scilab-5.0.2/modules/helptools/src/java/org/scilab/modules/helptools/CopyConvert.java 2008/10/06 14:38:09 28063
+@@ -45,9 +45,7 @@
+ import org.apache.batik.transcoder.image.ImageTranscoder;
+ import org.apache.batik.transcoder.image.PNGTranscoder;
+
+-import net.sourceforge.jeuclid.MathBase;
+-import net.sourceforge.jeuclid.ParameterKey;
+-import net.sourceforge.jeuclid.Converter;
++import net.sourceforge.jeuclid.ant.MathMLConverter;
+
+ /**
+ * @TODO add comment
+@@ -605,18 +603,19 @@
+ }
+
+ private boolean convertMathML(File inFile, File outFile) {
+- Map<ParameterKey, String> convertParams =
+- MathBase.getDefaultParameters();
+- convertParams.put(ParameterKey.OutFileType, "image/png");
+- convertParams.put(ParameterKey.AntiAlias, "true");
+- // Workaround a XEP problem. FOP 1 is OK.
+- convertParams.put(ParameterKey.BackgroundColor, "#FFFFFF");
+- convertParams.put(ParameterKey.FontSize, "14");
+-
++ /* Set the misc value ... used to be done in MathBase in jeuclid version 3.0.X */
++ MathMLConverter converter = new MathMLConverter();
++ converter.setType("image/png");
++ converter.setAntiAlias(true);
++ converter.setBackgroundColor("#FFFFFF");
++ converter.setFontSize(14);
++ converter.setIn(inFile);
++ converter.setOut(outFile);
++ converter.execute();
+ try {
+- Converter.convert(inFile, outFile, convertParams);
++
+ return true;
+- } catch (IOException e) {
++ } catch (Exception e) {
+ reportError("Cannot convert '" + inFile + "' to '"
+ + outFile + "': " + Helpers.reason(e));
+ return false;
Modified: packages/scilab/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/series?rev=35248&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/series (original)
+++ packages/scilab/trunk/debian/patches/series Thu Oct 9 16:09:17 2008
@@ -1,15 +1,3 @@
---- scilab-5.0.2.orig/bin/scilab 2008-10-01 16:56:54.000000000 +0200
-+++ scilab-5.0.2/bin/scilab 2008-10-01 16:58:13.000000000 +0200
-@@ -436,11 +436,7 @@
- #fi
- #export PVM_ARCH
-
--if test "$LD_LIBRARY_PATH" = ""; then
-- LD_LIBRARY_PATH=$SCI/bin:$SCI/lib/scilab/
--else
-- LD_LIBRARY_PATH=$SCI/bin:$SCI/lib/scilab/:$LD_LIBRARY_PATH
--fi
-+LD_LIBRARY_PATH=/usr/lib/scilab/:/usr/lib64/scilab/:$LD_LIBRARY_PATH
- if test $SCIVERBOSE -ne 0; then
- echo "LD_LIBRARY_PATH : $LD_LIBRARY_PATH"
- fi
+librarypath.diff
+docbook.diff
+jeuclid.diff
More information about the debian-science-commits
mailing list