diff -Nru scilab-5.5.1/debian/changelog scilab-5.5.1/debian/changelog --- scilab-5.5.1/debian/changelog 2014-12-08 14:06:14.000000000 +0000 +++ scilab-5.5.1/debian/changelog 2015-03-01 10:17:39.000000000 +0000 @@ -1,3 +1,25 @@ +scilab (5.5.1-7) unstable; urgency=medium + + * Team upload. + * Readd m4-hdf5.patch in d/patches/series, which had been mistakenly + removed in version 5.5.1-4. Remove hdf5-libsz.diff which has been + introduced in replacement. + * Also readd remove-exit.diff. + + -- Sébastien Villemot Sun, 01 Mar 2015 10:39:14 +0100 + +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 Sat, 28 Feb 2015 22:47:24 +0100 + scilab (5.5.1-5) unstable; urgency=medium * Remove some bashims (Closes: #772410, #772409, #772408) diff -Nru scilab-5.5.1/debian/patches/hdf5-libsz.diff scilab-5.5.1/debian/patches/hdf5-libsz.diff --- scilab-5.5.1/debian/patches/hdf5-libsz.diff 2014-12-08 15:14:41.000000000 +0000 +++ scilab-5.5.1/debian/patches/hdf5-libsz.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ -Index: scilab-5.5.1/configure -=================================================================== ---- scilab-5.5.1.orig/configure -+++ scilab-5.5.1/configure -@@ -10359,7 +10359,7 @@ if ${ac_cv_lib_hdf5_H5Fopen+:} false; th - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lhdf5 -lsz -lz -+LIBS="-lhdf5 -lz - $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -@@ -10450,7 +10450,7 @@ _ACEOF - - else - as_fn_error $? "libhdf5 or libhdf5_hl: library missing. (Cannot find symbol H5Fopen). Check if libhdf5 is installed and if the version is correct" "$LINENO" 5 -- -lsz -lz -+ -lz - - fi - -Index: scilab-5.5.1/m4/hdf5.m4 -=================================================================== ---- scilab-5.5.1.orig/m4/hdf5.m4 -+++ scilab-5.5.1/m4/hdf5.m4 -@@ -53,7 +53,7 @@ if test "x$with_hdf5_library" != "xyes"; - AC_CHECK_LIB([hdf5], [H5Fopen], - [], - [AC_MSG_ERROR([libhdf5 or libhdf5_hl: library missing. (Cannot find symbol H5Fopen) in $with_hdf5_library. Check if libhdf5 is installed and if the version is correct])], -- [-lsz -lz] -+ [-lz] - ) - - else -@@ -62,7 +62,7 @@ else - AC_CHECK_LIB([hdf5], [H5Fopen], - [], - [AC_MSG_ERROR([libhdf5 or libhdf5_hl: library missing. (Cannot find symbol H5Fopen). Check if libhdf5 is installed and if the version is correct])] -- [-lsz -lz] -+ [-lz] - ) - fi - diff -Nru scilab-5.5.1/debian/patches/m4-java-ppc64el.patch scilab-5.5.1/debian/patches/m4-java-ppc64el.patch --- scilab-5.5.1/debian/patches/m4-java-ppc64el.patch 2014-10-07 08:29:38.000000000 +0000 +++ scilab-5.5.1/debian/patches/m4-java-ppc64el.patch 2015-03-01 09:48:42.000000000 +0000 @@ -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") diff -Nru scilab-5.5.1/debian/patches/series scilab-5.5.1/debian/patches/series --- scilab-5.5.1/debian/patches/series 2014-12-08 15:14:50.000000000 +0000 +++ scilab-5.5.1/debian/patches/series 2015-03-01 10:19:03.000000000 +0000 @@ -5,6 +5,8 @@ jh.diff depend-scicos.diff missing-lib.diff +m4-hdf5.patch +m4-java-ppc64el.patch +remove-exit.diff bashim.diff jogl-2.2.diff -hdf5-libsz.diff