r36219 - in /packages/scilab/trunk/debian: changelog patches/renesas-sh.diff patches/sparc64.diff

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Mon Feb 22 23:23:17 2010
New Revision: 36219

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36219
Log:
  * Support of Renesas SH(sh4) thanks to Nobuhiro Iwamatsu for the patch
    renesas-sh.diff (Closes: #570587) 
  * Fix of an error in the sparc64 detection at runtime

Added:
    packages/scilab/trunk/debian/patches/renesas-sh.diff
    packages/scilab/trunk/debian/patches/sparc64.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=36219&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Mon Feb 22 23:23:17 2010
@@ -1,3 +1,17 @@
+scilab (5.2.1-3) unstable; urgency=low
+
+  * Support of Renesas SH(sh4) thanks to Nobuhiro Iwamatsu for the patch
+    renesas-sh.diff (Closes: #570587) 
+  * Fix of an error in the sparc64 detection at runtime
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 19 Feb 2010 23:50:54 +0100
+
+scilab (5.2.1-2) unstable; urgency=low
+
+  * Support of sparc64 (sparc64.diff)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 19 Feb 2010 12:10:12 +0100
+
 scilab (5.2.1-1) unstable; urgency=low
 
   * New upstream release

Added: packages/scilab/trunk/debian/patches/renesas-sh.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/renesas-sh.diff?rev=36219&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/renesas-sh.diff (added)
+++ packages/scilab/trunk/debian/patches/renesas-sh.diff Mon Feb 22 23:23:17 2010
@@ -1,0 +1,34 @@
+commit 9586bf474819f11734927d5138056c0c837b9bdb
+Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
+Date:   Fri Feb 19 23:44:51 2010 +0100
+
+    Support of Renesas SH(sh4)
+
+diff --git a/scilab/bin/scilab b/scilab/bin/scilab
+index 7ec4bbc..f453f9a 100755
+--- a/scilab/bin/scilab
++++ b/scilab/bin/scilab
+@@ -377,6 +377,9 @@ fi
+ 					"sparc64")
+ 						proc="sparc"
+ 						;;
++					sh*)
++						proc="sh"
++						;;
+ 					*)
+ 						echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us."
+ 						;;
+diff --git a/scilab/m4/java.m4 b/scilab/m4/java.m4
+index 469019b..918fbf7 100644
+--- a/scilab/m4/java.m4
++++ b/scilab/m4/java.m4
+@@ -446,6 +446,9 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
+ 		  s390x) # s390 arch can also returns s390x
+ 		  machine=s390
+ 		  ;;
++	    sh*)
++	  	  machine=sh
++		  ;;
+     esac
+ 
+ 	AC_MSG_LOG([Looking for JNI libs with $machine as machine hardware name])

Added: packages/scilab/trunk/debian/patches/sparc64.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/sparc64.diff?rev=36219&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/sparc64.diff (added)
+++ packages/scilab/trunk/debian/patches/sparc64.diff Mon Feb 22 23:23:17 2010
@@ -1,0 +1,40 @@
+commit 82bc3daabc423d8fa472308ace64979587c80f92
+Author: Sylvestre Ledru <sylvestre.ledru at scilab.org>
+Date:   Fri Feb 19 12:08:35 2010 +0100
+
+    Support of Linux sparc64 (debian)
+
+diff --git a/scilab/m4/java.m4 b/scilab/m4/java.m4
+index 9b75699..469019b 100644
+--- a/scilab/m4/java.m4
++++ b/scilab/m4/java.m4
+@@ -433,7 +433,7 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
+ 		# Solaris 10 x86
+           machine=i386
+           ;;
+-		sun*)
++		sun*|sparc64)
+        # Sun
+           machine=sparc
+           ;;
+--- a/scilab/bin/scilab	2010-02-19 23:59:34.000000000 +0100
++++ b/scilab/bin/scilab	2010-02-20 00:00:23.000000000 +0100
+@@ -374,6 +374,9 @@
+ 					"alpha")  
+ 						proc="alpha"
+ 						;;
++					"sparc64")
++						proc="sparc"
++						;;
+ 					*)
+ 						echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us."
+ 						;;
+@@ -392,7 +395,7 @@
+ 						proc="i386"
+ 						;;
+ 				# check for the 64 bits syntax
+-					"sparc")
++					"sparc"|"sparc64")
+ 						proc="sparc"
+ 						;;
+ 					*)