diff -u scilab-5.2.1/debian/README.Debian scilab-5.2.1/debian/README.Debian --- scilab-5.2.1/debian/README.Debian +++ scilab-5.2.1/debian/README.Debian @@ -4,8 +4,4 @@ -The homepage of scilab is http://www.scilab.org/ . Please check the -licence of the package if you are about to upload a new upstream version -of the package to the Debian archive. If the licence has changed in a -way that forbids autobuilding the package you have to contact Andreas -Barth before uploading it. - - -- Torsten Werner +The homepage of scilab is http://www.scilab.org/ +Scilab is free since version 5.0 + -- Sylvestre Ledru Sat, 03 Apr 2010 22:12:44 +0200 + +scilab (5.2.1-7) unstable; urgency=low + + * Bad detection on the CPU detection for the Java arch. + + -- Sylvestre Ledru Wed, 24 Mar 2010 00:45:20 +0100 + +scilab (5.2.1-6) unstable; urgency=low + + * Add a scilab bash completion script + + -- Sylvestre Ledru Mon, 22 Mar 2010 15:16:23 +0100 + scilab (5.2.1-5) unstable; urgency=low * scilab-include is now arch dependent because machine.h is arch dependent diff -u scilab-5.2.1/debian/control scilab-5.2.1/debian/control --- scilab-5.2.1/debian/control +++ scilab-5.2.1/debian/control @@ -6,7 +6,7 @@ Build-Depends: autoconf, automake, cdbs, debhelper (>= 7), cdbs, gfortran, default-jdk, chrpath, ocaml-nox, tcl8.5-dev, tk8.5-dev, libxml2-dev, libpcre3-dev, - gettext, libreadline-dev, pkg-config, lsb-release, + gettext, libreadline-dev, pkg-config, # numerical libraries libblas-dev | librefblas3-dev | libatlas-base-dev, liblapack-dev, # Java deps only in patch2: unchanged: --- scilab-5.2.1.orig/debian/patches/z_cpudetection.diff +++ scilab-5.2.1/debian/patches/z_cpudetection.diff @@ -0,0 +1,83 @@ +Index: scilab-5.2.1/bin/scilab +=================================================================== +--- scilab-5.2.1.orig/bin/scilab 2010-03-24 00:50:43.000000000 +0100 ++++ scilab-5.2.1/bin/scilab 2010-03-24 00:53:03.000000000 +0100 +@@ -368,21 +368,33 @@ + "ia64") + proc="i64" + ;; +- "ppc") +- proc="ppc" +- ;; + "alpha") + proc="alpha" + ;; +- "sparc64") +- proc="sparc" +- ;; + sh*) + proc="sh" + ;; + "sparc64") + proc="sparc" + ;; ++ "mips"|"mipsel") # under mipsel, uname -m is ++ # usually returning mips ... ++ # but binary are in mipsel ++ if test -d ${JRE_HOME}/lib/mipsel ; then ++ proc="mipsel" ++ else ++ proc="mips" ++ fi ++ ;; ++ "ppc"|"powerpc"|"ppc64") ++ proc="ppc" ++ ;; ++ "s390"|"s390x") ++ proc="s390" ++ ;; ++ "armv4l"|"armv5tel") ++ proc="arm" ++ ;; + *) + echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us." + ;; +@@ -409,34 +421,10 @@ + ;; + esac + ;; +- "mips"|"mipsel") # under mipsel, uname -m is +- # usually returning mips ... +- # but binary are in mipsel +- if test -d ${JRE_HOME}/lib/mipsel ; then +- proc="mipsel" +- else +- proc="mips" +- fi +- ;; +- "ia64") +- proc="ia64" +- ;; +- "ppc"|"powerpc"|"ppc64") +- proc="ppc" +- ;; +- "alpha") +- proc="alpha" +- ;; +- "s390"|"s390x") +- proc="s390" +- ;; +- *win32* | *WIN32* | *CYGWIN_NT*) +- proc="win32" +- JAVA_SHLIB="jvm.dll" +- ;; +- "armv4l"|"armv5tel") +- proc="arm" +- ;; ++ *win32* | *WIN32* | *CYGWIN_NT*) ++ proc="win32" ++ JAVA_SHLIB="jvm.dll" ++ ;; + *darwin* | *Darwin*) # MacOS X + # For Mac OS X, Since path are different from the JVM normal tree, + # don't need to detect the CPU only in patch2: unchanged: --- scilab-5.2.1.orig/debian/patches/test_run_permission.diff +++ scilab-5.2.1/debian/patches/test_run_permission.diff @@ -0,0 +1,40 @@ +commit b336cd4f58c3da15a1fec774b23bd0e5e3689292 +Author: Pierre MARECHAL +Date: Tue Mar 30 18:15:28 2010 +0200 + + Bug 6796 (and 6843) Fixed: test_run() crashed if SCI directory was read-only + +diff --git a/scilab/modules/development_tools/macros/test_run.sci b/scilab/modules/development_tools/macros/test_run.sci +index ffcd7b9..1c3fad9 100644 +--- a/scilab/modules/development_tools/macros/test_run.sci ++++ b/scilab/modules/development_tools/macros/test_run.sci +@@ -683,11 +683,11 @@ function st = st_set_name(st,name) + + st.name = name; + +- st.tmp_tst = pathconvert( TMPDIR + "/" + name + ".tst" , %F); +- st.tmp_dia = pathconvert( TMPDIR + "/" + name + ".dia" , %F); +- st.tmp_res = pathconvert( TMPDIR + "/" + name + ".res" , %F); +- st.tmp_err = pathconvert( TMPDIR + "/" + name + ".err" , %F); +- ++ st.tmp_tst = pathconvert( TMPDIR + "/" + name + ".tst" , %F); ++ st.tmp_dia = pathconvert( TMPDIR + "/" + name + ".dia.tmp" , %F); ++ st.tmp_res = pathconvert( TMPDIR + "/" + name + ".res" , %F); ++ st.tmp_err = pathconvert( TMPDIR + "/" + name + ".err" , %F); ++ st.path_dia = pathconvert( TMPDIR + "/" + name + ".dia" , %F); + endfunction + + function st = st_set_type(st,sttype) +@@ -696,10 +696,8 @@ endfunction + + function st = st_set_path(st,path) + +- st.path = path; +- basepath = strsubst(path,"/\.tst$/","","r"); +- st.path_dia = basepath + ".dia"; +- ++ st.path = path; ++ basepath = strsubst(path,"/\.tst$/","","r"); + st.path_dia_ref = basepath + ".dia.ref"; + + // Reference file management OS by OS only in patch2: unchanged: --- scilab-5.2.1.orig/debian/patches/better-feedback-on-lib-error.diff +++ scilab-5.2.1/debian/patches/better-feedback-on-lib-error.diff @@ -0,0 +1,34 @@ +diff --git a/scilab/modules/core/src/c/callDynamicGateway.c b/scilab/modules/core/src/c/callDynamicGateway.c +index 52dc74e..b230ceb 100644 +--- a/scilab/modules/core/src/c/callDynamicGateway.c ++++ b/scilab/modules/core/src/c/callDynamicGateway.c +@@ -46,8 +46,11 @@ dynamic_gateway_error_code callDynamicGateway(char *moduleName, + } + #else + *hlib = LoadDynLibrary(dynLibName); ++ + if (*hlib == NULL) + { ++ char *previousError = GetLastDynLibError(); ++ + /* Haven't been able to find the lib with dlopen... + * This can happen for two reasons: + * - the lib must be dynamically linked +@@ -68,8 +71,12 @@ dynamic_gateway_error_code callDynamicGateway(char *moduleName, + + if (*hlib == NULL) + { +- if (SciPath) {FREE(SciPath); SciPath = NULL;} +- if (pathToLib) {FREE(pathToLib); pathToLib = NULL;} ++ if (previousError != NULL) ++ { ++ sciprint("A previous error has been detected while loading %s: %s\n",dynLibName, previousError); ++ } ++ if (SciPath) {FREE(SciPath); SciPath = NULL;} ++ if (pathToLib) {FREE(pathToLib); pathToLib = NULL;} + return DYN_GW_LOAD_LIBRARY_ERROR; + } + if (SciPath) {FREE(SciPath); SciPath = NULL;} +-- +1.7.0 + only in patch2: unchanged: --- scilab-5.2.1.orig/debian/bash_completion.d/scilab +++ scilab-5.2.1/debian/bash_completion.d/scilab @@ -0,0 +1,54 @@ +# Scilab completion +# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab +# Copyright (C) DIGITEO - 2010 - Sylvestre Ledru +# This file must be used under the terms of the CeCILL. +# This source file is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + +_scilab() +{ + local cur prev options + COMPREPLY=() + cur=${COMP_WORDS[COMP_CWORD]} + prev=${COMP_WORDS[COMP_CWORD-1]} + + # List all options. Note that + options='-ns -nb -nw -nwni -nogui -debug -debug-kdbg -d -display -profiling -profiling-visu -l -mem -version -e -f -nouserstartup -args -mem -h --help' + + # Loop on the arguments to manage conflicting options + for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )); do + #exclude some mutually exclusive options + [[ ${COMP_WORDS[i]} == '-nwni' ]] && options=${options/-nw} + [[ ${COMP_WORDS[i]} == '-nw' ]] && options=${options/-nwni} + [[ ${COMP_WORDS[i]} == '-e' ]] && options=${options/-f} + done + + case "$1" in + *scilab-cli*) + # Option -nw is not available + options=${options/-nw} + ;; + esac + + case $prev in + -f) + _filedir '@(sci|sce|SCI|SCE|tst|TST)' + return 0 + ;; + -e|-l|-d|-display|-mem) + cur=${cur#[\"\']} + eqext='=' + ;; + + *) + COMPREPLY=( $( compgen -W "$options" | grep "^$cur" ) ) + ;; + esac + + return 0 +} +complete -F _scilab $filenames scilab scilab-cli scilab-adv-cli + +