r47000 - in /packages/scilab/branches/5.5/debian: changelog patches/m4-java-ppc64el.patch patches/series

[sebastien at users.alioth.debian.org]

Author: sebastien
Date: Sat Feb 28 21:48:12 2015
New Revision: 47000

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47000
Log:
Fix FTBFS on ppc64el

Modified:
    packages/scilab/branches/5.5/debian/changelog
    packages/scilab/branches/5.5/debian/patches/m4-java-ppc64el.patch
    packages/scilab/branches/5.5/debian/patches/series

Modified: packages/scilab/branches/5.5/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/changelog?rev=47000&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/changelog	(original)
+++ packages/scilab/branches/5.5/debian/changelog	Sat Feb 28 21:48:12 2015
@@ -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)

Modified: packages/scilab/branches/5.5/debian/patches/m4-java-ppc64el.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/m4-java-ppc64el.patch?rev=47000&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/m4-java-ppc64el.patch	(original)
+++ packages/scilab/branches/5.5/debian/patches/m4-java-ppc64el.patch	Sat Feb 28 21:48:12 2015
@@ -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 @@
 +                        "ppc"|"powerpc")
                              proc="ppc"
                              ;;
-+                        "ppc64"|"ppc64el")
++                        "ppc64"|"ppc64le")
 +                            proc="ppc64"
 +                            ;;
                          "s390")

Modified: packages/scilab/branches/5.5/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/series?rev=47000&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/series	(original)
+++ packages/scilab/branches/5.5/debian/patches/series	Sat Feb 28 21:48:12 2015
@@ -8,3 +8,4 @@
 bashim.diff
 jogl-2.2.diff
 hdf5-libsz.diff
+m4-java-ppc64el.patch