r46927 - in /packages/scilab/branches/5.5/debian: changelog patches/m4-java-ppc64el.patch patches/remove-exit.diff patches/series

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Thu Oct  2 21:25:12 2014
New Revision: 46927

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46927
Log:
* New upstream release
  - Support of openjdk 8 (Closes: #760931)
* Support of ppc64el (Closes: #761920)

Added:
    packages/scilab/branches/5.5/debian/patches/remove-exit.diff
Modified:
    packages/scilab/branches/5.5/debian/changelog
    packages/scilab/branches/5.5/debian/patches/m4-java-ppc64el.patch
    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=46927&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/changelog	(original)
+++ packages/scilab/branches/5.5/debian/changelog	Thu Oct  2 21:25:12 2014
@@ -1,10 +1,10 @@
-scilab (5.5.0-4) unstable; urgency=medium
-
-  * Team upload.
-  * Fix FTBFS on ppc64el with new patch m4-java-ppc64el.patch from
-    Aurélien Jarno (closes: #761920).
-
- -- Gilles Filippini <pini at debian.org>  Thu, 02 Oct 2014 21:08:43 +0200
+scilab (5.5.1-1) unstable; urgency=medium
+
+  * New upstream release
+    - Support of openjdk 8 (Closes: #760931)
+  * Support of ppc64el (Closes: #761920)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Thu, 02 Oct 2014 13:16:47 +0200
 
 scilab (5.5.0-3) unstable; urgency=medium
 

Modified: packages/scilab/branches/5.5/debian/patches/m4-java-ppc64el.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/m4-java-ppc64el.patch?rev=46927&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/m4-java-ppc64el.patch	(original)
+++ packages/scilab/branches/5.5/debian/patches/m4-java-ppc64el.patch	Thu Oct  2 21:25:12 2014
@@ -1,9 +1,3 @@
-Description: Fix m4/java.m4 to support ppc64el. Also change the machine
- for ppc64 big endian, which use the same directory as the little
- endian version. I guess it was wrongly set as a 32-bit. powerpc
- machine can run a 64-bit kernel.
-Author: Aurélien Jarno <aurel32 at debian.org>
-Packages should be built using the linux32 wrapper on such machines.
 --- 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], [
@@ -20,3 +14,21 @@
          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
+@@ -525,9 +525,12 @@ detect_java_vm() {
+                                 proc="mips"
+                             fi
+                             ;;
+-                        "ppc"|"powerpc"|"ppc64")
++                        "ppc"|"powerpc"
+                             proc="ppc"
+                             ;;
++                        "ppc64"|"ppc64el")
++                            proc="ppc64"
++                            ;;
+                         "s390")
+                             proc="s390"
+                             ;;

Added: packages/scilab/branches/5.5/debian/patches/remove-exit.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/remove-exit.diff?rev=46927&op=file
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/remove-exit.diff	(added)
+++ packages/scilab/branches/5.5/debian/patches/remove-exit.diff	Thu Oct  2 21:25:12 2014
@@ -0,0 +1,12 @@
+Index: scilab-5.5.1/modules/console/src/c/cmdLine/getKey.c
+===================================================================
+--- scilab-5.5.1.orig/modules/console/src/c/cmdLine/getKey.c
++++ scilab-5.5.1/modules/console/src/c/cmdLine/getKey.c
+@@ -240,7 +240,6 @@ static void getKey(wchar_t ** commandLin
+         case CTRL_D:
+             rmChar(*commandLine, SCI_DELETE, cursorLocation);
+             updateTokenInScilabHistory(commandLine);
+-            exit(0);
+             break;
+         case CTRL_E:
+             endLine(*commandLine, cursorLocation);

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=46927&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/series	(original)
+++ packages/scilab/branches/5.5/debian/patches/series	Thu Oct  2 21:25:12 2014
@@ -7,3 +7,4 @@
 missing-lib.diff
 m4-hdf5.patch
 m4-java-ppc64el.patch
+remove-exit.diff