diff -Nru scilab-5.5.1/debian/changelog scilab-5.5.1/debian/changelog
--- scilab-5.5.1/debian/changelog	2014-11-14 10:48:07.000000000 +0000
+++ scilab-5.5.1/debian/changelog	2015-03-01 10:17:39.000000000 +0000
@@ -1,3 +1,31 @@
+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 <sebastien@debian.org>  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 <sebastien@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)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 08 Dec 2014 15:03:32 +0100
+
 scilab (5.5.1-4) unstable; urgency=medium
 
   * Set a minimal version on the libjogl2 package
diff -Nru scilab-5.5.1/debian/patches/bashim.diff scilab-5.5.1/debian/patches/bashim.diff
--- scilab-5.5.1/debian/patches/bashim.diff	1970-01-01 00:00:00.000000000 +0000
+++ scilab-5.5.1/debian/patches/bashim.diff	2015-03-01 09:48:42.000000000 +0000
@@ -0,0 +1,51 @@
+Index: scilab-5.5.0/bin/scilab
+===================================================================
+--- scilab-5.5.0.orig/bin/scilab
++++ scilab-5.5.0/bin/scilab
+@@ -50,7 +50,7 @@ if test -n "$SCI"; then
+     if test ! -d "$SCI/modules"; then
+         echo "Cannot find directory $SCI/modules/ !"
+         echo "SCI should point to the root data directory of Scilab"
+-        exit -1
++        exit 1
+     fi
+ fi
+ 
+@@ -804,7 +804,7 @@ case $OS in
+         # When started as an Application, the default path was "/"
+         # It is not really useful. Changing to HOME.
+         # See bugs 8339 and 10575 for rational
+-        if test "$(pwd)" == "/"; then
++        if test "$(pwd)" = "/"; then
+             cd $HOME
+         fi
+ 
+Index: scilab-5.5.0/modules/dynamic_link/src/scripts/scicompile.sh
+===================================================================
+--- scilab-5.5.0.orig/modules/dynamic_link/src/scripts/scicompile.sh
++++ scilab-5.5.0/modules/dynamic_link/src/scripts/scicompile.sh
+@@ -18,13 +18,13 @@ ORIGINALLIBNAME=libsciexternal
+ 
+ if test ! -s Makefile.orig; then 
+ 	echo "The compiler detection has been performed. Please launch compilerDetection.sh before."
+-	exit -1
++	exit 1
+ fi
+ 
+ # Check number of parameters
+ if test $# -lt 2; then
+ 	echo "Syntax : $0 libname sources"
+-	exit -2
++	exit 2
+ fi
+ 
+ # retrieve parameters
+@@ -38,7 +38,7 @@ for file in $SOURCES_TEMP; do
+ 	FFILE=`echo $file|sed -e 's|\.o$|\.f|g'`
+ 	if [ ! -s $file -a -s $CFILE -a -s $FFILE ]; then 
+ 		echo "Error: Cannot find $file"
+-		exit -3
++		exit 3
+ 	fi
+ 	# It is an include file, do not build it!
+ 	if [ ! `echo $file|grep -i -E "(\.h$|\.hh$|\.hxx$|\.H$)"` ]; then
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-11-06 09:52:33.000000000 +0000
+++ scilab-5.5.1/debian/patches/series	2015-03-01 10:19:03.000000000 +0000
@@ -8,4 +8,5 @@
 m4-hdf5.patch
 m4-java-ppc64el.patch
 remove-exit.diff
+bashim.diff
 jogl-2.2.diff