[scilab] 04/16: Import Debian changes 5.5.1-5

[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 05615a7d41f529a82584a51bc13fd74bd42fa6d6
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Mon Dec 8 15:03:32 2014 +0100

    Import Debian changes 5.5.1-5
    
    scilab (5.5.1-5) unstable; urgency=medium
    
      * Remove some bashims (Closes: #772410, #772409, #772408)
---
 debian/changelog               |  6 +++++
 debian/patches/bashim.diff     | 51 ++++++++++++++++++++++++++++++++++++++++++
 debian/patches/hdf5-libsz.diff | 44 ++++++++++++++++++++++++++++++++++++
 debian/patches/series          |  5 ++---
 4 files changed, 103 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 36f06cf..1d7dfbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+scilab (5.5.1-5) unstable; urgency=medium
+
+  * Remove some bashims (Closes: #772410, #772409, #772408)
+
+ -- Sylvestre Ledru <sylvestre at 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 --git a/debian/patches/bashim.diff b/debian/patches/bashim.diff
new file mode 100644
index 0000000..7bae41c
--- /dev/null
+++ b/debian/patches/bashim.diff
@@ -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 --git a/debian/patches/hdf5-libsz.diff b/debian/patches/hdf5-libsz.diff
new file mode 100644
index 0000000..0de0909
--- /dev/null
+++ b/debian/patches/hdf5-libsz.diff
@@ -0,0 +1,44 @@
+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 --git a/debian/patches/series b/debian/patches/series
index 79b5b19..ddec717 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,7 +5,6 @@ disable-xcos-dep-check.diff
 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

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