r35656 - in /packages/scilab/trunk/debian: changelog patches/jvm-powerpc.diff
sylvestre-guest at users.alioth.debian.org
sylvestre-guest at users.alioth.debian.org
Sun Apr 19 15:02:35 UTC 2009
Author: sylvestre-guest
Date: Sun Apr 19 15:02:35 2009
New Revision: 35656
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35656
Log:
Add a patch to manage powerpc detection of the JVM
Added:
packages/scilab/trunk/debian/patches/jvm-powerpc.diff
Modified:
packages/scilab/trunk/debian/changelog
Modified: packages/scilab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/changelog?rev=35656&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Sun Apr 19 15:02:35 2009
@@ -1,8 +1,14 @@
scilab (5.1.1-1) experimental; urgency=low
+ [ Christoph Korn ]
* New upstream version.
-
- -- Christoph Korn <c_korn at gmx.de> Tue, 14 Apr 2009 17:46:43 +0200
+ (patches 64bitsdetection.diff filesWithSpace.diff javaHeadLess.diff
+ displayStack.diff xmlCleanupParser.diff removed. Applied upstream)
+
+ [ Sylvestre Ledru ]
+ * Add a patch to manage powerpc detection of the JVM
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr> Sun, 19 Apr 2009 16:42:49 +0200
scilab (5.1-2) experimental; urgency=low
Added: packages/scilab/trunk/debian/patches/jvm-powerpc.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/jvm-powerpc.diff?rev=35656&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/jvm-powerpc.diff (added)
+++ packages/scilab/trunk/debian/patches/jvm-powerpc.diff Sun Apr 19 15:02:35 2009
@@ -1,0 +1,393 @@
+diff --git a/scilab/configure b/scilab/configure
+index a7f2537..3b264ec 100755
+--- a/scilab/configure
++++ b/scilab/configure
+@@ -11743,6 +11743,9 @@ $as_echo "$ac_cv_java_jvm_jni_working" >&6; }
+ # Sun
+ machine=sparc
+ ;;
++ powerpc)
++ machine=ppc
++ ;;
+ esac
+
+ # Check for known JDK installation layouts
+@@ -12861,7 +12864,7 @@ $as_echo_n "checking flexdock... " >&6; }
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 12864 "configure"
++// #line 12867 "configure"
+ import org.flexdock.docking.DockingManager;
+
+ public class conftest {
+@@ -12934,7 +12937,7 @@ $as_echo_n "checking looks... " >&6; }
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 12937 "configure"
++// #line 12940 "configure"
+ import com.jgoodies.looks.common.RenderingUtils;
+
+ public class conftest {
+@@ -13007,7 +13010,7 @@ $as_echo_n "checking looks2... " >&6; }
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 13010 "configure"
++// #line 13013 "configure"
+ import com.jgoodies.looks.common.RenderingUtils;
+
+ public class conftest {
+@@ -13083,7 +13086,7 @@ $as_echo_n "checking skinlf... " >&6; }
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 13086 "configure"
++// #line 13089 "configure"
+ import com.l2fprod.util.AccessUtils;
+
+ public class conftest {
+@@ -13156,7 +13159,7 @@ $as_echo_n "checking jogl... " >&6; }
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 13159 "configure"
++// #line 13162 "configure"
+ import javax.media.opengl.glu.GLUnurbs;
+
+ public class conftest {
+@@ -13229,7 +13232,7 @@ $as_echo_n "checking jhall... " >&6; }
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 13232 "configure"
++// #line 13235 "configure"
+ import javax.help.JHelp;
+
+ public class conftest {
+@@ -13302,7 +13305,7 @@ $as_echo_n "checking javahelp2... " >&6; }
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 13305 "configure"
++// #line 13308 "configure"
+ import javax.help.JHelp;
+
+ public class conftest {
+@@ -13376,7 +13379,7 @@ $as_echo_n "checking gluegen-rt... " >&6; }
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 13379 "configure"
++// #line 13382 "configure"
+ import com.sun.gluegen.runtime.CPU;
+
+ public class conftest {
+@@ -13449,7 +13452,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 13452 "configure"
++// #line 13455 "configure"
+ import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
+
+ public class conftest {
+@@ -13522,7 +13525,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 13525 "configure"
++// #line 13528 "configure"
+ import com.artenum.rosetta.core.action.AbstractConsoleAction;
+
+ public class conftest {
+@@ -13595,7 +13598,7 @@ $as_echo_n "checking commons-logging... " >&6; }
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 13598 "configure"
++// #line 13601 "configure"
+ import org.apache.commons.logging.LogFactory;
+
+ public class conftest {
+@@ -25897,7 +25900,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
+ { $as_echo "$as_me:$LINENO: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
+ $as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
+ cat > conftest.$ac_ext <<EOF
+-#line 25900 "configure"
++#line 25903 "configure"
+ #include "confdefs.h"
+
+ #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
+@@ -26456,7 +26459,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
+ $as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
+
+ cat > conftest.$ac_ext <<EOF
+-#line 26459 "configure"
++#line 26462 "configure"
+ #include "confdefs.h"
+
+ #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
+@@ -27306,7 +27309,7 @@ $as_echo_n "checking batik-all... " >&6; }
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 27309 "configure"
++// #line 27312 "configure"
+ import org.apache.batik.parser.Parser;
+
+ public class conftest {
+@@ -27379,7 +27382,7 @@ $as_echo_n "checking batik... " >&6; }
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 27382 "configure"
++// #line 27385 "configure"
+ import org.apache.batik.parser.Parser;
+
+ public class conftest {
+@@ -27454,7 +27457,7 @@ $as_echo_n "checking saxon... " >&6; }
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 27457 "configure"
++// #line 27460 "configure"
+ import com.icl.saxon.Loader;
+
+ public class conftest {
+@@ -27527,7 +27530,7 @@ $as_echo_n "checking fop... " >&6; }
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 27530 "configure"
++// #line 27533 "configure"
+ import org.apache.fop.pdf.PDFInfo;
+
+ public class conftest {
+@@ -27600,7 +27603,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 27603 "configure"
++// #line 27606 "configure"
+ import net.sourceforge.jeuclid.LayoutContext;
+
+ public class conftest {
+@@ -27673,7 +27676,7 @@ $as_echo_n "checking commons-io... " >&6; }
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 27676 "configure"
++// #line 27679 "configure"
+ import org.apache.commons.io.output.CountingOutputStream;
+
+ public class conftest {
+@@ -27746,7 +27749,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 27749 "configure"
++// #line 27752 "configure"
+ import org.apache.xmlgraphics.util.Service;
+
+ public class conftest {
+@@ -27819,7 +27822,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 27822 "configure"
++// #line 27825 "configure"
+ import org.w3c.dom.svg.SVGDocument;
+
+ public class conftest {
+@@ -27893,7 +27896,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
+ export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+ cat << \EOF > conftest.java
+-// #line 27896 "configure"
++// #line 27899 "configure"
+ import org.apache.avalon.framework.configuration.ConfigurationException;
+
+ public class conftest {
+@@ -28539,7 +28542,7 @@ ia64-*-hpux*)
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 28542 "configure"' > conftest.$ac_ext
++ echo '#line 28545 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -30409,11 +30412,11 @@ else
+ -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:30412: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:30415: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:30416: \$? = $ac_status" >&5
++ echo "$as_me:30419: \$? = $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.
+@@ -30699,11 +30702,11 @@ else
+ -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:30702: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:30705: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:30706: \$? = $ac_status" >&5
++ echo "$as_me:30709: \$? = $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.
+@@ -30803,11 +30806,11 @@ else
+ -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:30806: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:30809: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:30810: \$? = $ac_status" >&5
++ echo "$as_me:30813: \$? = $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
+@@ -33288,7 +33291,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 33291 "configure"
++#line 33294 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -33388,7 +33391,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 33391 "configure"
++#line 33394 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -35817,11 +35820,11 @@ else
+ -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:35820: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:35823: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:35824: \$? = $ac_status" >&5
++ echo "$as_me:35827: \$? = $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.
+@@ -35921,11 +35924,11 @@ else
+ -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:35924: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:35927: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:35928: \$? = $ac_status" >&5
++ echo "$as_me:35931: \$? = $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
+@@ -37519,11 +37522,11 @@ else
+ -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:37522: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:37525: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:37526: \$? = $ac_status" >&5
++ echo "$as_me:37529: \$? = $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.
+@@ -37623,11 +37626,11 @@ else
+ -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:37626: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:37629: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:37630: \$? = $ac_status" >&5
++ echo "$as_me:37633: \$? = $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
+@@ -39855,11 +39858,11 @@ else
+ -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:39858: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:39861: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:39862: \$? = $ac_status" >&5
++ echo "$as_me:39865: \$? = $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.
+@@ -40145,11 +40148,11 @@ else
+ -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:40148: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:40151: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:40152: \$? = $ac_status" >&5
++ echo "$as_me:40155: \$? = $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.
+@@ -40249,11 +40252,11 @@ else
+ -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:40252: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:40255: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:40256: \$? = $ac_status" >&5
++ echo "$as_me:40259: \$? = $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 --git a/scilab/m4/java.m4 b/scilab/m4/java.m4
+index 3d41dab..ba1293f 100644
+--- a/scilab/m4/java.m4
++++ b/scilab/m4/java.m4
+@@ -422,6 +422,9 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
+ # Sun
+ machine=sparc
+ ;;
++ powerpc)
++ machine=ppc
++ ;;
+ esac
+
+ # Check for known JDK installation layouts
More information about the debian-science-commits
mailing list