r47149 - in /packages/scilab/branches/5.5/debian: changelog patches/aarch64-detection.patch patches/jvm-archdir-ppc64le.diff

[pini at users.alioth.debian.org]

Author: pini
Date: Mon Oct 19 16:04:06 2015
New Revision: 47149

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47149
Log:
Fix ppc64le detection in bin/scilab

and upload release 5.5.2-2~exp3 to experimental.

Modified:
    packages/scilab/branches/5.5/debian/changelog
    packages/scilab/branches/5.5/debian/patches/aarch64-detection.patch
    packages/scilab/branches/5.5/debian/patches/jvm-archdir-ppc64le.diff

Modified: packages/scilab/branches/5.5/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/changelog?rev=47149&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/changelog	(original)
+++ packages/scilab/branches/5.5/debian/changelog	Mon Oct 19 16:04:06 2015
@@ -1,3 +1,11 @@
+scilab (5.5.2-2~exp3) experimental; urgency=medium
+
+  * Tentative fix for ppc64el arch: complete patch
+    jvm-archdir-ppc64le.diff to fix bin/scilab.
+  * Refresh patch aarch64-detection.patch.
+
+ -- Gilles Filippini <pini at debian.org>  Mon, 19 Oct 2015 18:01:52 +0200
+
 scilab (5.5.2-2~exp2) experimental; urgency=medium
 
   * Bump the versioned build-depends on libjogl2-java.

Modified: packages/scilab/branches/5.5/debian/patches/aarch64-detection.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/aarch64-detection.patch?rev=47149&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/aarch64-detection.patch	(original)
+++ packages/scilab/branches/5.5/debian/patches/aarch64-detection.patch	Mon Oct 19 16:04:06 2015
@@ -1,9 +1,11 @@
 Description: Fix Aarch64 detection
 Author: Martin Michlmayr <tbm at cyrius.com>
 
+Index: scilab-5.5.2/bin/scilab
+===================================================================
 --- scilab-5.5.2.orig/bin/scilab
 +++ scilab-5.5.2/bin/scilab
-@@ -540,6 +540,9 @@ detect_java_vm() {
+@@ -543,6 +543,9 @@ detect_java_vm() {
                          armv*)
                              proc="arm"
                              ;;

Modified: packages/scilab/branches/5.5/debian/patches/jvm-archdir-ppc64le.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/jvm-archdir-ppc64le.diff?rev=47149&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/jvm-archdir-ppc64le.diff	(original)
+++ packages/scilab/branches/5.5/debian/patches/jvm-archdir-ppc64le.diff	Mon Oct 19 16:04:06 2015
@@ -1,20 +1,34 @@
-Index: b/m4/java.m4
+Index: scilab-5.5.2/m4/java.m4
 ===================================================================
---- a/m4/java.m4
-+++ b/m4/java.m4
-@@ -481,7 +481,14 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
+--- scilab-5.5.2.orig/m4/java.m4
++++ scilab-5.5.2/m4/java.m4
+@@ -481,7 +481,10 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
          powerpc)
            machine=ppc
            ;;
 -        ppc64|ppc64le)
 +        ppc64le)
-+          if test -d $ac_java_jvm_dir/jre/lib/ppc64le/server; then
-+            machine=ppc64le
-+          else
-+            machine=ppc64le
-+          fi
++          machine=ppc64le
 +          ;;
 +        ppc64)
            machine=ppc64
            ;;
          armv*)
+Index: scilab-5.5.2/bin/scilab
+===================================================================
+--- scilab-5.5.2.orig/bin/scilab
++++ scilab-5.5.2/bin/scilab
+@@ -528,9 +528,12 @@ detect_java_vm() {
+                         "ppc"|"powerpc")
+                             proc="ppc"
+                             ;;
+-                        "ppc64"|"ppc64el")
++                        "ppc64")
+                             proc="ppc64"
+                             ;;
++                        "ppc64le")
++                            proc="ppc64le"
++                            ;;
+                         "s390")
+                             proc="s390"
+                             ;;