r36886 - in /packages/scilab: branches/5.3/ branches/5.3/debian/ branches/5.3/debian/patches/ trunk/debian/ trunk/debian/patches/

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Sun Sep 12 09:28:44 2010
New Revision: 36886

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36886
Log:
+
+  [ Matthias Klose ]
+  * Fix JVM detection for armv<anything> machines (Closes: #596509)

Added:
    packages/scilab/branches/5.3/
      - copied from r36372, packages/scilab/trunk/
    packages/scilab/branches/5.3/debian/changelog
      - copied, changed from r36720, packages/scilab/trunk/debian/changelog
    packages/scilab/branches/5.3/debian/control
      - copied unchanged from r36720, packages/scilab/trunk/debian/control
    packages/scilab/branches/5.3/debian/libscilab-java.lintian-overrides
      - copied unchanged from r36720, packages/scilab/trunk/debian/libscilab-java.lintian-overrides
    packages/scilab/branches/5.3/debian/patches/javalibpath.diff
      - copied unchanged from r36720, packages/scilab/trunk/debian/patches/javalibpath.diff
    packages/scilab/branches/5.3/debian/rules
      - copied unchanged from r36720, packages/scilab/trunk/debian/rules
    packages/scilab/branches/5.3/debian/scilab-minimal-bin.install
      - copied unchanged from r36412, packages/scilab/trunk/debian/scilab-minimal-bin.install
    packages/scilab/trunk/debian/patches/xarmjavadetection.diff
Removed:
    packages/scilab/branches/5.3/debian/patches/full_support.diff
    packages/scilab/branches/5.3/debian/patches/renesas-sh.diff
    packages/scilab/branches/5.3/debian/patches/sparc64.diff
    packages/scilab/branches/5.3/debian/patches/z_cpudetection.diff
Modified:
    packages/scilab/trunk/debian/changelog

Copied: packages/scilab/branches/5.3/debian/changelog (from r36720, packages/scilab/trunk/debian/changelog)
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.3/debian/changelog?rev=36886&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/branches/5.3/debian/changelog Sun Sep 12 09:28:44 2010
@@ -1,3 +1,9 @@
+scilab (5.3.0-beta-1-3) experimental; urgency=low
+
+  * New upstream release
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 06 Jul 2010 20:21:33 +0200
+
 scilab (5.2.2-2) unstable; urgency=low
 
   * Missing files in libjavasci (Closes: #585679)

Modified: packages/scilab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/changelog?rev=36886&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Sun Sep 12 09:28:44 2010
@@ -1,3 +1,10 @@
+scilab (5.2.2-5) unstable; urgency=low
+
+  [ Matthias Klose ]
+  * Fix JVM detection for armv<anything> machines (Closes: #596509)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 12 Sep 2010 11:14:58 +0200
+
 scilab (5.2.2-4) unstable; urgency=low
 
   * Fix a FTBFS under powerpc (conflicting declaration of basename)

Added: packages/scilab/trunk/debian/patches/xarmjavadetection.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/xarmjavadetection.diff?rev=36886&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/xarmjavadetection.diff (added)
+++ packages/scilab/trunk/debian/patches/xarmjavadetection.diff Sun Sep 12 09:28:44 2010
@@ -1,0 +1,24 @@
+--- ./m4/java.m4.orig	2010-04-20 09:59:27.000000000 +0000
++++ ./m4/java.m4	2010-09-11 20:27:40.476741575 +0000
+@@ -440,7 +440,7 @@
+ 	    powerpc|ppc64)
+ 	  	  machine=ppc
+ 		  ;;
+-		  armv4l|armv5tel)
++		  armv*)
+ 		  machine=arm
+ 		  ;;
+ 		  s390x) # s390 arch can also returns s390x
+Index: scilab-5.2.2/bin/scilab
+===================================================================
+--- scilab-5.2.2.orig/bin/scilab	2010-09-12 11:24:38.000000000 +0200
++++ scilab-5.2.2/bin/scilab	2010-09-12 11:25:01.000000000 +0200
+@@ -398,7 +398,7 @@
+ 					"s390"|"s390x")
+ 						proc="s390"
+ 						;;
+-					"armv4l"|"armv5tel")
++					armv*)
+ 						proc="arm"
+ 						;;
+ 					*)