r36292 - in /packages/scilab/trunk/debian: changelog control patches/full_support.diff

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Mon Mar 22 14:18:59 2010
New Revision: 36292

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36292
Log:
  * scilab-include is now arch dependent because machine.h is arch dependent
    and is included by some Scilab modules and causes some potential issues 
    like in scilab-overload (Closes: #550243)



Added:
    packages/scilab/trunk/debian/patches/full_support.diff
Modified:
    packages/scilab/trunk/debian/changelog
    packages/scilab/trunk/debian/control

Modified: packages/scilab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/changelog?rev=36292&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Mon Mar 22 14:18:59 2010
@@ -1,11 +1,20 @@
-scilab (5.2.1-4) unstable; urgency=low 
+scilab (5.2.1-5) unstable; urgency=low
+
+  * scilab-include is now arch dependent because machine.h is arch dependent
+    and is included by some Scilab modules and causes some potential issues 
+    like in scilab-overload (Closes: #550243)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 08 Mar 2010 15:58:54 +0100
+
+scilab (5.2.1-4) unstable; urgency=low
  
+  [ Christoph Korn ]
   * debian/rules, debian/watcher.sh: Add a ticker to the build to prevent 
     timeouts on some arches (only use it on Ubuntu because Debian does not 
     have a timeout). Thanks to Colin Watson and Iain Lane for this idea. 
     The watcher has been copied from the agda package. 
  
- -- Christoph Korn <christoph.korn at getdeb.net>  Tue, 23 Feb 2010 13:14:33 +0100
+ -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 05 Mar 2010 14:19:01 +0100
 
 scilab (5.2.1-3) unstable; urgency=low
 

Modified: packages/scilab/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/control?rev=36292&op=diff
==============================================================================
--- packages/scilab/trunk/debian/control (original)
+++ packages/scilab/trunk/debian/control Mon Mar 22 14:18:59 2010
@@ -32,7 +32,7 @@
 Architecture: all
 Depends: scilab-minimal-bin (>= ${source:Version}), 
  scilab-data (= ${binary:Version}), ${misc:Depends}, 
- scilab-include (= ${binary:Version})
+ scilab-include (>= ${source:Version})
 # scilab-include is installed by default since it is widely used by many
 # toolboxes
 Recommends: scilab-sivp (>= 5.0.0)
@@ -77,7 +77,8 @@
 
 
 Package: scilab-include
-Architecture: all
+# any because of the bug #550243
+Architecture: any
 Depends: ${misc:Depends}
 Description: Scientific software package for numerical computations (include files)
  Scilab is a matrix-based scientific software package.

Added: packages/scilab/trunk/debian/patches/full_support.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/full_support.diff?rev=36292&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/full_support.diff (added)
+++ packages/scilab/trunk/debian/patches/full_support.diff Mon Mar 22 14:18:59 2010
@@ -1,0 +1,24 @@
+commit 409faec413e7491450f51059af02b0469cbb01eb
+Author: Sylvestre Ledru <sylvestre.ledru at scilab.org>
+Date:   Fri Feb 19 23:42:38 2010 +0100
+
+    full support of sparc64
+
+diff --git a/scilab/bin/scilab b/scilab/bin/scilab
+index c4d6548..7ec4bbc 100755
+--- a/scilab/bin/scilab
++++ b/scilab/bin/scilab
+@@ -371,9 +371,12 @@ fi
+ 					"ppc")
+ 						proc="ppc"
+ 						;;
+-					"alpha")  
++					"alpha")
+ 						proc="alpha"
+ 						;;
++					"sparc64")
++						proc="sparc"
++						;;
+ 					*)
+ 						echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us."
+ 						;;