r36312 - in /packages/scilab/trunk/debian: changelog patches/z_cpudetection.diff

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Fri Mar 26 15:01:30 2010
New Revision: 36312

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36312
Log:
  * Bad detection on the CPU detection for the Java arch.


Added:
    packages/scilab/trunk/debian/patches/z_cpudetection.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=36312&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Fri Mar 26 15:01:30 2010
@@ -1,3 +1,9 @@
+scilab (5.2.1-7) unstable; urgency=low
+
+  * Bad detection on the CPU detection for the Java arch.
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Wed, 24 Mar 2010 00:45:20 +0100
+
 scilab (5.2.1-6) unstable; urgency=low
 
   * Add a scilab bash completion script

Added: packages/scilab/trunk/debian/patches/z_cpudetection.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/z_cpudetection.diff?rev=36312&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/z_cpudetection.diff (added)
+++ packages/scilab/trunk/debian/patches/z_cpudetection.diff Fri Mar 26 15:01:30 2010
@@ -1,0 +1,83 @@
+Index: scilab-5.2.1/bin/scilab
+===================================================================
+--- scilab-5.2.1.orig/bin/scilab	2010-03-24 00:50:43.000000000 +0100
++++ scilab-5.2.1/bin/scilab	2010-03-24 00:53:03.000000000 +0100
+@@ -368,21 +368,33 @@
+ 					"ia64")
+ 						proc="i64"
+ 						;;
+-					"ppc")
+-						proc="ppc"
+-						;;
+ 					"alpha")
+ 						proc="alpha"
+ 						;;
+-					"sparc64")
+-						proc="sparc"
+-						;;
+ 					sh*)
+ 						proc="sh"
+ 						;;
+ 					"sparc64")
+ 						proc="sparc"
+ 						;;
++		                        "mips"|"mipsel") # under mipsel, uname -m is
++                	                        # usually returning mips ...
++                        	                # but binary are in mipsel
++		                                if test -d ${JRE_HOME}/lib/mipsel ; then
++                		                        proc="mipsel"
++		                                else
++                		                        proc="mips"
++		                                fi
++                		                ;;
++					"ppc"|"powerpc"|"ppc64")
++		                                proc="ppc"
++                		                ;;
++		                        "s390"|"s390x")
++		                                proc="s390"
++		                                ;;
++		                        "armv4l"|"armv5tel")
++		                                proc="arm"
++		                                ;;
+ 					*)
+ 						echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us."
+ 						;;
+@@ -409,34 +421,10 @@
+ 						;;
+ 				esac
+ 				;;
+-			"mips"|"mipsel") # under mipsel, uname -m is
+-					# usually returning mips ...
+-					# but binary are in mipsel
+-				if test -d ${JRE_HOME}/lib/mipsel ; then
+-					proc="mipsel"
+-				else
+-					proc="mips"
+-				fi
+-				;;
+-			"ia64")
+-				proc="ia64"
+-				;;
+-		    "ppc"|"powerpc"|"ppc64")
+-				proc="ppc"
+-				;;
+-			"alpha")  
+-				proc="alpha"
+-				;;
+-			"s390"|"s390x")
+-				proc="s390"
+-				;;
+-			*win32* | *WIN32* | *CYGWIN_NT*)
+-				proc="win32"
+-				JAVA_SHLIB="jvm.dll"
+-				;;
+-			"armv4l"|"armv5tel")
+-				proc="arm"
+-				;;
++                        *win32* | *WIN32* | *CYGWIN_NT*)
++                                proc="win32"
++                                JAVA_SHLIB="jvm.dll"
++                                ;;
+ 			*darwin* | *Darwin*) # MacOS X
+         # For Mac OS X, Since path are different from the JVM normal tree, 
+ 		# don't need to detect the CPU