[scilab] 09/16: Import Debian changes 5.5.2-1.2

[Julien Puydt]

This is an automated email from the git hooks/post-receive script.

jpuydt-guest pushed a commit to branch master
in repository scilab.

commit 736f248ac0fdaaf1574da0c380c8f64f9568da57
Author: Matthias Klose <doko at debian.org>
Date:   Wed Oct 7 10:02:09 2015 +0200

    Import Debian changes 5.5.2-1.2
    
    scilab (5.5.2-1.2) unstable; urgency=medium
    
      * Non-maintainer upload.
      * Fix build with changed jvm architecure directory on ppc64el.
        Closes: #801060.
      * Fix Aarch64 detection (Martin Michlmayr). Closes: #791539.
---
 debian/changelog                        |  9 +++++++++
 debian/patches/aarch64-detection.patch  | 15 +++++++++++++++
 debian/patches/jvm-archdir-ppc64le.diff | 20 ++++++++++++++++++++
 debian/patches/series                   |  2 ++
 4 files changed, 46 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 574d6a6..5f9d7bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+scilab (5.5.2-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix build with changed jvm architecure directory on ppc64el.
+    Closes: #801060.
+  * Fix Aarch64 detection (Martin Michlmayr). Closes: #791539.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 07 Oct 2015 10:02:09 +0200
+
 scilab (5.5.2-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/patches/aarch64-detection.patch b/debian/patches/aarch64-detection.patch
new file mode 100644
index 0000000..316691c
--- /dev/null
+++ b/debian/patches/aarch64-detection.patch
@@ -0,0 +1,15 @@
+Description: Fix Aarch64 detection
+Author: Martin Michlmayr <tbm at cyrius.com>
+
+--- scilab-5.5.2.orig/bin/scilab
++++ scilab-5.5.2/bin/scilab
+@@ -540,6 +540,9 @@ detect_java_vm() {
+                         armv*)
+                             proc="arm"
+                             ;;
++                        aarch64)
++                            proc="aarch64"
++                            ;;
+                         *)
+                             echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us on http://bugzilla.scilab.org"
+                             ;;
diff --git a/debian/patches/jvm-archdir-ppc64le.diff b/debian/patches/jvm-archdir-ppc64le.diff
new file mode 100644
index 0000000..d7fab9f
--- /dev/null
+++ b/debian/patches/jvm-archdir-ppc64le.diff
@@ -0,0 +1,20 @@
+Index: b/m4/java.m4
+===================================================================
+--- a/m4/java.m4
++++ b/m4/java.m4
+@@ -481,7 +481,14 @@ 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
++          ;;
++        ppc64)
+           machine=ppc64
+           ;;
+         armv*)
diff --git a/debian/patches/series b/debian/patches/series
index e4a224b..b53e2ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,5 @@ missing-lib.diff
 xmlgraphics-commons-2.0.diff
 fop-2.0.diff
 batik-1.8.diff
+jvm-archdir-ppc64le.diff
+aarch64-detection.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/scilab.git