← Back to branch summary

~ubuntu-branches/ubuntu/precise/scilab/precise

« back to all changes in this revision

Viewing changes to debian/patches/z_cpudetection.diff

  • Committer: Bazaar Package Importer
  • Author(s): Sylvestre Ledru
  • Date: 2010-04-03 22:12:44 UTC
  • mfrom: (4.3.15 sid)
  • Revision ID: james.westby@ubuntu.com-20100403221244-0x5827lijgkiobuh
Tags: 5.2.1-8
* Enable also the keep alive for Debian (sparc has some pbs on the 
 documentation build)
* Update of the completion script
* Update of the README.Debian file (Scilab is free since 5.0.0)
* Fix a problem with the unitary tests (permission). Backport from upstream.
  test_run_permission.diff
* In case of error on the library load, provide more feedbacks 
  better-feedback-on-lib-error.diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/z_cpudetection.diff
 
1
Index: scilab-5.2.1/bin/scilab
 
2
===================================================================
 
3
--- scilab-5.2.1.orig/bin/scilab        2010-03-24 00:50:43.000000000 +0100
 
4
+++ scilab-5.2.1/bin/scilab     2010-03-24 00:53:03.000000000 +0100
 
5
@@ -368,21 +368,33 @@
 
6
                                        "ia64")
 
7
                                                proc="i64"
 
8
                                                ;;
 
9
-                                       "ppc")
 
10
-                                               proc="ppc"
 
11
-                                               ;;
 
12
                                        "alpha")
 
13
                                                proc="alpha"
 
14
                                                ;;
 
15
-                                       "sparc64")
 
16
-                                               proc="sparc"
 
17
-                                               ;;
 
18
                                        sh*)
 
19
                                                proc="sh"
 
20
                                                ;;
 
21
                                        "sparc64")
 
22
                                                proc="sparc"
 
23
                                                ;;
 
24
+                                       "mips"|"mipsel") # under mipsel, uname -m is
 
25
+                                               # usually returning mips ...
 
26
+                                               # but binary are in mipsel
 
27
+                                               if test -d ${JRE_HOME}/lib/mipsel ; then
 
28
+                                                       proc="mipsel"
 
29
+                                               else
 
30
+                                                       proc="mips"
 
31
+                                               fi
 
32
+                                               ;;
 
33
+                                       "ppc"|"powerpc"|"ppc64")
 
34
+                                               proc="ppc"
 
35
+                                               ;;
 
36
+                                       "s390"|"s390x")
 
37
+                                               proc="s390"
 
38
+                                               ;;
 
39
+                                       "armv4l"|"armv5tel")
 
40
+                                               proc="arm"
 
41
+                                               ;;
 
42
                                        *)
 
43
                                                echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us."
 
44
                                                ;;
 
45
@@ -409,34 +421,10 @@
 
46
                                                ;;
 
47
                                esac
 
48
                                ;;
 
49
-                       "mips"|"mipsel") # under mipsel, uname -m is
 
50
-                                       # usually returning mips ...
 
51
-                                       # but binary are in mipsel
 
52
-                               if test -d ${JRE_HOME}/lib/mipsel ; then
 
53
-                                       proc="mipsel"
 
54
-                               else
 
55
-                                       proc="mips"
 
56
-                               fi
 
57
-                               ;;
 
58
-                       "ia64")
 
59
-                               proc="ia64"
 
60
-                               ;;
 
61
-                   "ppc"|"powerpc"|"ppc64")
 
62
-                               proc="ppc"
 
63
-                               ;;
 
64
-                       "alpha")  
 
65
-                               proc="alpha"
 
66
-                               ;;
 
67
-                       "s390"|"s390x")
 
68
-                               proc="s390"
 
69
-                               ;;
 
70
-                       *win32* | *WIN32* | *CYGWIN_NT*)
 
71
-                               proc="win32"
 
72
-                               JAVA_SHLIB="jvm.dll"
 
73
-                               ;;
 
74
-                       "armv4l"|"armv5tel")
 
75
-                               proc="arm"
 
76
-                               ;;
 
77
+                        *win32* | *WIN32* | *CYGWIN_NT*)
 
78
+                                proc="win32"
 
79
+                                JAVA_SHLIB="jvm.dll"
 
80
+                                ;;
 
81
                        *darwin* | *Darwin*) # MacOS X
 
82
         # For Mac OS X, Since path are different from the JVM normal tree, 
 
83
                # don't need to detect the CPU