[scilab] 05/16: Import Debian changes 5.5.1-6

[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 d378160acf7a7aa8879a169dedf3695ee5df8ceb
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Sat Feb 28 22:47:24 2015 +0100

    Import Debian changes 5.5.1-6
    
    scilab (5.5.1-6) unstable; urgency=medium
    
      * Team upload.
      * Readd m4-java-ppc64el.patch in d/patches/series. It had been
        mistakenly removed in the previous upload. This fixes the FTBFS on
        ppc64el. (Closes: #776525)
      * Fix a mistake in the above patch concerning bin/scilab. The machine
        name (output of 'uname -m') is ppc64le and not ppc64el. This error
        was making scilab unable to start on ppc64el.
---
 debian/changelog                     | 12 ++++++++++++
 debian/patches/m4-java-ppc64el.patch | 14 ++++++--------
 debian/patches/series                |  1 +
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1d7dfbf..defa2e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+scilab (5.5.1-6) unstable; urgency=medium
+
+  * Team upload.
+  * Readd m4-java-ppc64el.patch in d/patches/series. It had been
+    mistakenly removed in the previous upload. This fixes the FTBFS on
+    ppc64el. (Closes: #776525)
+  * Fix a mistake in the above patch concerning bin/scilab. The machine
+    name (output of 'uname -m') is ppc64le and not ppc64el. This error
+    was making scilab unable to start on ppc64el.
+
+ -- Sébastien Villemot <sebastien at debian.org>  Sat, 28 Feb 2015 22:47:24 +0100
+
 scilab (5.5.1-5) unstable; urgency=medium
 
   * Remove some bashims (Closes: #772410, #772409, #772408)
diff --git a/debian/patches/m4-java-ppc64el.patch b/debian/patches/m4-java-ppc64el.patch
index f90f86f..c82ca9a 100644
--- a/debian/patches/m4-java-ppc64el.patch
+++ b/debian/patches/m4-java-ppc64el.patch
@@ -1,6 +1,6 @@
---- scilab-5.5.0.orig/m4/java.m4
-+++ scilab-5.5.0/m4/java.m4
-@@ -471,9 +471,12 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
+--- a/m4/java.m4
++++ b/m4/java.m4
+@@ -474,9 +474,12 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
         # Sun
            machine=sparc
            ;;
@@ -14,10 +14,8 @@
          armv*)
            machine=arm
            ;;
-diff --git a/scilab/bin/scilab b/scilab/bin/scilab
-index 863cb3c..3331931 100755
---- scilab-5.5.0.orig/bin/scilab
-+++ scilab-5.5.0/scilab/bin/scilab
+--- a/bin/scilab
++++ b/bin/scilab
 @@ -525,9 +525,12 @@ detect_java_vm() {
                                  proc="mips"
                              fi
@@ -26,7 +24,7 @@ index 863cb3c..3331931 100755
 +                        "ppc"|"powerpc")
                              proc="ppc"
                              ;;
-+                        "ppc64"|"ppc64el")
++                        "ppc64"|"ppc64le")
 +                            proc="ppc64"
 +                            ;;
                          "s390")
diff --git a/debian/patches/series b/debian/patches/series
index ddec717..f32f526 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ missing-lib.diff
 bashim.diff
 jogl-2.2.diff
 hdf5-libsz.diff
+m4-java-ppc64el.patch

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