r35326 - /packages/scilab/trunk/debian/patches/docbook.diff
sylvestre-guest at users.alioth.debian.org
sylvestre-guest at users.alioth.debian.org
Thu Nov 13 16:47:22 UTC 2008
Author: sylvestre-guest
Date: Thu Nov 13 16:47:22 2008
New Revision: 35326
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35326
Log:
Check against more recent version of batik & jeuclid
Modified:
packages/scilab/trunk/debian/patches/docbook.diff
Modified: packages/scilab/trunk/debian/patches/docbook.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/docbook.diff?rev=35326&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/docbook.diff (original)
+++ packages/scilab/trunk/debian/patches/docbook.diff Thu Nov 13 16:47:22 2008
@@ -1,13 +1,31 @@
-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 @@
+--- scilab-5.0.3.orig/m4/docbook.m4 2008-11-05 18:42:13.000000000 +0100
++++ scilab-5.0.3/m4/docbook.m4 2008-11-12 13:38:16.000000000 +0100
+@@ -25,7 +25,7 @@
+ 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 +40,7 @@
+ 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.LayoutContext],[MathML rendering solution])
+ JEUCLID_CORE=$PACKAGE_JAR_FILE
+ AC_SUBST(JEUCLID_CORE)
+
+--- scilab-5.0.3.orig/configure 2008-11-05 18:42:13.000000000 +0100
++++ scilab-5.0.3/configure 2008-11-12 14:03:35.000000000 +0100
+@@ -25944,13 +25944,13 @@
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
@@ -19,16 +37,7 @@
# 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 @@
+@@ -26002,8 +26002,8 @@
if test "$found_jar" = "no"; then
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
@@ -39,268 +48,23 @@
{ (exit 1); exit 1; }; }
fi
-@@ -26025,7 +26026,7 @@
- export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+@@ -26166,7 +26166,7 @@
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"
+ // #line 26168 "configure"
-import net.sourceforge.jeuclid.MathBase;
-+// #line 26166 "configure"
-+import net.sourceforge.jeuclid.ant.MathMLConverter;
++import net.sourceforge.jeuclid.LayoutContext;
public class conftest {
public static void main(String[] argv) {
-@@ -26202,8 +26204,8 @@
+@@ -26206,8 +26206,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;}
++ { { 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.LayoutContext)" >&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.LayoutContext)" >&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
-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)
-
More information about the debian-science-commits
mailing list