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

[pini at users.alioth.debian.org]

Author: pini
Date: Thu Oct  2 19:10:19 2014
New Revision: 46925

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

Patch m4-java-ppc64el.patch against m4/java.m4 by Aurélien Jarno.

Added:
    packages/scilab/branches/5.5/debian/patches/m4-java-ppc64el.patch
Modified:
    packages/scilab/branches/5.5/debian/changelog
    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=46925&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/changelog	(original)
+++ packages/scilab/branches/5.5/debian/changelog	Thu Oct  2 19:10:19 2014
@@ -1,3 +1,11 @@
+scilab (5.5.0-4) unstable; urgency=medium
+
+  * Team upload.
+  * Fix FTBFS on ppc64el with new patch m4-java-ppc64el.patch from
+    Aurélien Jarno (closes: #761920).
+
+ -- Gilles Filippini <pini at debian.org>  Thu, 02 Oct 2014 21:08:43 +0200
+
 scilab (5.5.0-3) unstable; urgency=medium
 
   [Gilles Filippini]

Added: 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=46925&op=file
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/m4-java-ppc64el.patch	(added)
+++ packages/scilab/branches/5.5/debian/patches/m4-java-ppc64el.patch	Thu Oct  2 19:10:19 2014
@@ -0,0 +1,22 @@
+Description: Fix m4/java.m4 to support ppc64el. Also change the machine
+ for ppc64 big endian, which use the same directory as the little
+ endian version. I guess it was wrongly set as a 32-bit. powerpc
+ machine can run a 64-bit kernel.
+Author: Aurélien Jarno <aurel32 at debian.org>
+Packages should be built using the linux32 wrapper on such machines.
+--- 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], [
+        # Sun
+           machine=sparc
+           ;;
+-        powerpc|ppc64)
++        powerpc)
+           machine=ppc
+           ;;
++        ppc64|ppc64le)
++          machine=ppc64
++          ;;
+         armv*)
+           machine=arm
+           ;;

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=46925&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/series	(original)
+++ packages/scilab/branches/5.5/debian/patches/series	Thu Oct  2 19:10:19 2014
@@ -6,3 +6,4 @@
 depend-scicos.diff
 missing-lib.diff
 m4-hdf5.patch
+m4-java-ppc64el.patch