r46954 - in /packages/scilab/branches/5.5/debian: changelog patches/bashim.diff patches/series

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Mon Dec  8 14:05:58 2014
New Revision: 46954

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46954
Log:
Remove some bashims (Closes: #772410, #772409, #772408)

Added:
    packages/scilab/branches/5.5/debian/patches/bashim.diff
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=46954&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/changelog	(original)
+++ packages/scilab/branches/5.5/debian/changelog	Mon Dec  8 14:05:58 2014
@@ -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

Added: packages/scilab/branches/5.5/debian/patches/bashim.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/bashim.diff?rev=46954&op=file
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/bashim.diff	(added)
+++ packages/scilab/branches/5.5/debian/patches/bashim.diff	Mon Dec  8 14:05:58 2014
@@ -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

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=46954&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/series	(original)
+++ packages/scilab/branches/5.5/debian/patches/series	Mon Dec  8 14:05:58 2014
@@ -5,7 +5,4 @@
 jh.diff
 depend-scicos.diff
 missing-lib.diff
-m4-hdf5.patch
-m4-java-ppc64el.patch
-remove-exit.diff
-jogl-2.2.diff
+bashim.diff