r38626 - in /packages/scilab/trunk/debian: changelog patches/mips64.diff patches/series

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Fri Jul 22 17:28:45 2011
New Revision: 38626

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38626
Log:
scilab (5.3.2-2) unstable; urgency=low

  * Add mips64 support (mips64.diff)

 -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 20 Jun 2011 02:06:13 +0200


Modified:
    packages/scilab/trunk/debian/changelog
    packages/scilab/trunk/debian/patches/mips64.diff
    packages/scilab/trunk/debian/patches/series

Modified: packages/scilab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/changelog?rev=38626&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Fri Jul 22 17:28:45 2011
@@ -1,3 +1,9 @@
+scilab (5.3.2-2) unstable; urgency=low
+
+  * Add mips64 support (mips64.diff)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 20 Jun 2011 02:06:13 +0200
+
 scilab (5.3.2-1) unstable; urgency=low
 
   * New upstream release (updateOfJgoodies.diff & wrongVersion.diff removed)

Modified: packages/scilab/trunk/debian/patches/mips64.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/mips64.diff?rev=38626&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/mips64.diff (original)
+++ packages/scilab/trunk/debian/patches/mips64.diff Fri Jul 22 17:28:45 2011
@@ -1,12 +1,29 @@
-diff -ur scilab-5.3.1.orig/bin/scilab scilab-5.3.1/bin//scilab
---- scilab-5.3.1.orig/bin/scilab	2011-03-01 16:11:07.000000000 +0100
-+++ scilab-5.3.1/bin//scilab	2011-03-01 16:18:39.000000000 +0100
-@@ -446,7 +446,7 @@
+Index: scilab-5.3.2/bin/scilab
+===================================================================
+--- scilab-5.3.2.orig/bin/scilab	2011-06-20 02:12:33.000000000 +0200
++++ scilab-5.3.2/bin/scilab	2011-06-20 02:12:43.000000000 +0200
+@@ -470,8 +470,8 @@
                          "ia64")
                              proc="ia64"
                              ;;
 -                        "mips"|"mipsel") # under mipsel, uname -m is
+-                    # usually returning mips ...
 +                        mips*) # under mipsel, uname -m is
-                     # usually returning mips ...
++                    # usually returning mips or mips64 ...
                      # but binary are in mipsel
                              if test -d ${JRE_HOME}/lib/mipsel ; then
+                                 proc="mipsel"
+Index: scilab-5.3.2/m4/java.m4
+===================================================================
+--- scilab-5.3.2.orig/m4/java.m4	2011-06-20 02:12:46.000000000 +0200
++++ scilab-5.3.2/m4/java.m4	2011-06-20 02:13:07.000000000 +0200
+@@ -462,6 +462,9 @@
+         sh*)
+             machine=sh
+           ;;
++        mips64)
++            machine=mips
++          ;;
+     esac
+ 
+     AC_MSG_LOG([Looking for JNI libs with $machine as machine hardware name])

Modified: packages/scilab/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/series?rev=38626&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/series (original)
+++ packages/scilab/trunk/debian/patches/series Fri Jul 22 17:28:45 2011
@@ -5,3 +5,4 @@
 missingaddchapter.diff
 modelicac-not-available.diff
 0001-Typo-in-the-scilab-adv-cli-desktop-declaration.patch
+