r43860 - in /packages/scilab/trunk/debian: changelog control patches/default-java-path.diff patches/series
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Sun Sep 4 04:48:08 UTC 2011
Author: sylvestre
Date: Sun Sep 4 04:48:06 2011
New Revision: 43860
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=43860
Log:
* default-java-path.diff: For the usage of /usr/lib/jvm/default-java to
detect the right path of Java (due to the multiarch changes in the
openjdk) (Closes: #639924)
* Fix a minor typo in the description
Added:
packages/scilab/trunk/debian/patches/default-java-path.diff
Modified:
packages/scilab/trunk/debian/changelog
packages/scilab/trunk/debian/control
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=43860&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Sun Sep 4 04:48:06 2011
@@ -1,9 +1,18 @@
+scilab (5.3.3-3) unstable; urgency=low
+
+ * default-java-path.diff: For the usage of /usr/lib/jvm/default-java to
+ detect the right path of Java (due to the multiarch changes in the
+ openjdk) (Closes: #639924)
+ * Fix a minor typo in the description
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Thu, 01 Sep 2011 22:59:30 +0200
+
scilab (5.3.3-2) unstable; urgency=low
* Get ride of .la files (Closes: #633209)
* Unused override removed
* Fix some minor man warnings
- * Update the description of libscilab2-java (Remove warning
+ * Update the description of libscilab2-java (Remove warning
duplicate-short-description)
* Upstream changelog added (no-upstream-changelog)
* Fix unneeded-build-dep-on-quilt & copyright-refers-to-symlink-license
Modified: packages/scilab/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/control?rev=43860&op=diff
==============================================================================
--- packages/scilab/trunk/debian/control (original)
+++ packages/scilab/trunk/debian/control Sun Sep 4 04:48:06 2011
@@ -41,7 +41,7 @@
Description: Scientific software package - Command Line Interpreter
Scilab is a matrix-based scientific software package.
Scilab contains hundreds of built-in mathematical functions, rich
- data structures (including polynomials, rationals,linear systems, lists,
+ data structures (including polynomials, rationals, linear systems, lists,
etc...) and comes with a number of specific toolboxes for
control, signal processing, ...
.
@@ -59,7 +59,7 @@
Description: Scientific software package for numerical computations
Scilab is a matrix-based scientific software package.
Scilab contains hundreds of built-in mathematical functions, rich
- data structures (including polynomials, rationals,linear systems, lists,
+ data structures (including polynomials, rationals, linear systems, lists,
etc...) and comes with a number of specific toolboxes for control, signal
processing, ...
.
@@ -79,7 +79,7 @@
Description: Scientific software package for numerical computations (data files)
Scilab is a matrix-based scientific software package.
Scilab contains hundreds of built-in mathematical functions, rich
- data structures (including polynomials, rationals,linear systems, lists,
+ data structures (including polynomials, rationals, linear systems, lists,
etc...) and comes with a number of specific toolboxes for
control, signal processing, ...
.
@@ -101,7 +101,7 @@
Description: Scientific software package for numerical computations (include files)
Scilab is a matrix-based scientific software package.
Scilab contains hundreds of built-in mathematical functions, rich
- data structures (including polynomials, rationals,linear systems, lists,
+ data structures (including polynomials, rationals, linear systems, lists,
etc...) and comes with a number of specific toolboxes for
control, signal processing, ...
.
@@ -124,7 +124,7 @@
Description: Scientific software package for numerical computations (minimal binary files)
Scilab is a matrix-based scientific software package.
Scilab contains hundreds of built-in mathematical functions, rich
- data structures (including polynomials, rationals,linear systems, lists,
+ data structures (including polynomials, rationals, linear systems, lists,
etc...) and comes with a number of specific toolboxes for
control, signal processing, ...
.
@@ -154,13 +154,14 @@
Description: Scientific software package for numerical computations (all binary files)
Scilab is a matrix-based scientific software package.
Scilab contains hundreds of built-in mathematical functions, rich
- data structures (including polynomials, rationals,linear systems, lists,
+ data structures (including polynomials, rationals, linear systems, lists,
etc...) and comes with a number of specific toolboxes for
- control, signal processing, ...
- .
- This package also provides Xcos, a graphical editor to design hybrid
- dynamical systems models. Models can be designed, loaded, saved, compiled and
- simulated.
+ control, signal processing ...
+ .
+ This package also provides Xcos, a graphical editor to design hybrid
+ dynamical systems models. Models can be designed, loaded, saved, compiled and
+ simulated.
+ .
Stable and efficient solution for industrial and academics needs, Xcos
provides functionalities for modeling of mechanical systems (automotive,
aeronautics...), hydraulic circuits (dam, pipe modeling...), control systems,
@@ -168,19 +169,7 @@
.
This package contains the architecture specific binary files.
-#Package: scilab-xcos
-#Architecture: any
-#Depends: ${shlibs:Depends}, scilab-bin, ${misc:Depends}, libjgraphx-java,
-# libjhdf5-java
-#Description: Scientific software package for numerical computations (binary files)
-# Scilab is a matrix-based scientific software package.
-# Scilab contains hundreds of built-in mathematical functions, rich
-# data structures (including polynomials, rationals,linear systems, lists,
-# etc...) and comes with a number of specific toolboxes for
-# control, signal processing, ...
-# .
-# This package contains the architecture specific binary files.
-
+
Package: scilab-minimal-bin-dbg
Architecture: any
Section: debug
@@ -191,7 +180,7 @@
Description: Scientific software package (scilab-cli debugging symbols)
Scilab is a matrix-based scientific software package.
Scilab contains hundreds of built-in mathematical functions, rich
- data structures (including polynomials, rationals,linear systems, lists,
+ data structures (including polynomials, rationals, linear systems, lists,
etc...) and comes with a number of specific toolboxes for
control, signal processing, ...
.
@@ -215,7 +204,7 @@
Description: Scientific software package (scilab debugging symbols)
Scilab is a matrix-based scientific software package.
Scilab contains hundreds of built-in mathematical functions, rich
- data structures (including polynomials, rationals,linear systems, lists,
+ data structures (including polynomials, rationals, linear systems, lists,
etc...) and comes with a number of specific toolboxes for
control, signal processing, ...
.
@@ -228,7 +217,7 @@
Description: Scientific software package for numerical computations (Java API)
Scilab is a matrix-based scientific software package.
Scilab contains hundreds of built-in mathematical functions, rich
- data structures (including polynomials, rationals,linear systems, lists,
+ data structures (including polynomials, rationals, linear systems, lists,
etc...) and comes with a number of specific toolboxes for
control, signal processing, ...
.
@@ -254,7 +243,7 @@
Description: Scientific software package for numerical computations (Java v2 API)
Scilab is a matrix-based scientific software package.
Scilab contains hundreds of built-in mathematical functions, rich
- data structures (including polynomials, rationals,linear systems, lists,
+ data structures (including polynomials, rationals, linear systems, lists,
etc...) and comes with a number of specific toolboxes for
control, signal processing, ...
.
@@ -278,7 +267,7 @@
Description: Scientific software package (english documentations)
Scilab is a matrix-based scientific software package.
Scilab contains hundreds of built-in mathematical functions, rich
- data structures (including polynomials, rationals,linear systems, lists,
+ data structures (including polynomials, rationals, linear systems, lists,
etc...) and comes with a number of specific toolboxes for
control, signal processing, ...
.
@@ -299,7 +288,7 @@
Description: Scientific software package (french documentation)
Scilab is a matrix-based scientific software package.
Scilab contains hundreds of built-in mathematical functions, rich
- data structures (including polynomials, rationals,linear systems, lists,
+ data structures (including polynomials, rationals, linear systems, lists,
etc...) and comes with a number of specific toolboxes for
control, signal processing, ...
.
@@ -320,7 +309,7 @@
Description: Scientific software package (Brazilian Portuguese documentation)
Scilab is a matrix-based scientific software package.
Scilab contains hundreds of built-in mathematical functions, rich
- data structures (including polynomials, rationals,linear systems, lists,
+ data structures (including polynomials, rationals, linear systems, lists,
etc...) and comes with a number of specific toolboxes for
control, signal processing, ...
.
@@ -341,7 +330,7 @@
Description: Scientific software package (Japanese documentation)
Scilab is a matrix-based scientific software package.
Scilab contains hundreds of built-in mathematical functions, rich
- data structures (including polynomials, rationals,linear systems, lists,
+ data structures (including polynomials, rationals, linear systems, lists,
etc...) and comes with a number of specific toolboxes for
control, signal processing, ...
.
@@ -362,7 +351,7 @@
Description: Scientific software package for numerical computations (test files)
Scilab is a matrix-based scientific software package.
Scilab contains hundreds of built-in mathematical functions, rich
- data structures (including polynomials, rationals,linear systems, lists,
+ data structures (including polynomials, rationals, linear systems, lists,
etc...) and comes with a number of specific toolboxes for
control, signal processing, ...
.
Added: packages/scilab/trunk/debian/patches/default-java-path.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/default-java-path.diff?rev=43860&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/default-java-path.diff (added)
+++ packages/scilab/trunk/debian/patches/default-java-path.diff Sun Sep 4 04:48:06 2011
@@ -1,0 +1,39 @@
+Index: scilab-5.3.3/bin/scilab
+===================================================================
+--- scilab-5.3.3.orig/bin/scilab 2011-09-01 22:47:22.000000000 +0200
++++ scilab-5.3.3/bin/scilab 2011-09-01 22:47:39.000000000 +0200
+@@ -382,7 +382,7 @@
+ # Browse "default directory" (if it means anything under Unix/Linux) of Java
+ # to find where it could be !
+ if test -z "$JAVA_HOME"; then
+- JAVA_DEFAULT_DIR="/usr/lib/jvm/java-6-openjdk/ /usr/lib/jvm/java/ /usr/lib/jvm/java-6-sun/ /usr/lib/j2se/1.6 /usr/java/jdk1.6.0*/ /usr/java/jdk1.5.0*/ /usr/lib/j2sdk1.6-ibm /usr/lib/jvm/java-1.5.0-sun /usr/java/ /usr/lib/j2se/1.5 /usr/lib/j2se/1.4 /usr/java/jre1.6.0*/ /usr/java/jre1.5.0*/ /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.4-sun /usr/lib/jvm/java-gcj /usr/lib/jvm/java-1.5.0-gcj/ /usr/lib/kaffe/pthreads /usr/lib/jvm/java-1.7.0-icedtea-*/ /usr/lib/jvm/jre/ /usr/local/diablo-jdk1.6.0/"
++ JAVA_DEFAULT_DIR="/usr/lib/jvm/default-java/ /usr/lib/jvm/java-6-openjdk/ /usr/lib/jvm/java/ /usr/lib/jvm/java-6-sun/ /usr/lib/j2se/1.6 /usr/java/jdk1.6.0*/ /usr/java/jdk1.5.0*/ /usr/lib/j2sdk1.6-ibm /usr/lib/jvm/java-1.5.0-sun /usr/java/ /usr/lib/j2se/1.5 /usr/lib/j2se/1.4 /usr/java/jre1.6.0*/ /usr/java/jre1.5.0*/ /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.4-sun /usr/lib/jvm/java-gcj /usr/lib/jvm/java-1.5.0-gcj/ /usr/lib/kaffe/pthreads /usr/lib/jvm/java-1.7.0-icedtea-*/ /usr/lib/jvm/jre/ /usr/local/diablo-jdk1.6.0/"
+ for JAVA_HOME in $JAVA_DEFAULT_DIR ; do
+ if test $SCIVERBOSE -ne 0; then
+ echo "Trying to find Java in $JAVA_HOME "
+Index: scilab-5.3.3/bin/scilab-cli
+===================================================================
+--- scilab-5.3.3.orig/bin/scilab-cli 2011-09-01 22:47:22.000000000 +0200
++++ scilab-5.3.3/bin/scilab-cli 2011-09-01 22:47:39.000000000 +0200
+@@ -382,7 +382,7 @@
+ # Browse "default directory" (if it means anything under Unix/Linux) of Java
+ # to find where it could be !
+ if test -z "$JAVA_HOME"; then
+- JAVA_DEFAULT_DIR="/usr/lib/jvm/java-6-openjdk/ /usr/lib/jvm/java/ /usr/lib/jvm/java-6-sun/ /usr/lib/j2se/1.6 /usr/java/jdk1.6.0*/ /usr/java/jdk1.5.0*/ /usr/lib/j2sdk1.6-ibm /usr/lib/jvm/java-1.5.0-sun /usr/java/ /usr/lib/j2se/1.5 /usr/lib/j2se/1.4 /usr/java/jre1.6.0*/ /usr/java/jre1.5.0*/ /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.4-sun /usr/lib/jvm/java-gcj /usr/lib/jvm/java-1.5.0-gcj/ /usr/lib/kaffe/pthreads /usr/lib/jvm/java-1.7.0-icedtea-*/ /usr/lib/jvm/jre/ /usr/local/diablo-jdk1.6.0/"
++ JAVA_DEFAULT_DIR="/usr/lib/jvm/default-java/ /usr/lib/jvm/java-6-openjdk/ /usr/lib/jvm/java/ /usr/lib/jvm/java-6-sun/ /usr/lib/j2se/1.6 /usr/java/jdk1.6.0*/ /usr/java/jdk1.5.0*/ /usr/lib/j2sdk1.6-ibm /usr/lib/jvm/java-1.5.0-sun /usr/java/ /usr/lib/j2se/1.5 /usr/lib/j2se/1.4 /usr/java/jre1.6.0*/ /usr/java/jre1.5.0*/ /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.4-sun /usr/lib/jvm/java-gcj /usr/lib/jvm/java-1.5.0-gcj/ /usr/lib/kaffe/pthreads /usr/lib/jvm/java-1.7.0-icedtea-*/ /usr/lib/jvm/jre/ /usr/local/diablo-jdk1.6.0/"
+ for JAVA_HOME in $JAVA_DEFAULT_DIR ; do
+ if test $SCIVERBOSE -ne 0; then
+ echo "Trying to find Java in $JAVA_HOME "
+Index: scilab-5.3.3/bin/scilab-adv-cli
+===================================================================
+--- scilab-5.3.3.orig/bin/scilab-adv-cli 2011-09-01 22:47:22.000000000 +0200
++++ scilab-5.3.3/bin/scilab-adv-cli 2011-09-01 22:47:39.000000000 +0200
+@@ -382,7 +382,7 @@
+ # Browse "default directory" (if it means anything under Unix/Linux) of Java
+ # to find where it could be !
+ if test -z "$JAVA_HOME"; then
+- JAVA_DEFAULT_DIR="/usr/lib/jvm/java-6-openjdk/ /usr/lib/jvm/java/ /usr/lib/jvm/java-6-sun/ /usr/lib/j2se/1.6 /usr/java/jdk1.6.0*/ /usr/java/jdk1.5.0*/ /usr/lib/j2sdk1.6-ibm /usr/lib/jvm/java-1.5.0-sun /usr/java/ /usr/lib/j2se/1.5 /usr/lib/j2se/1.4 /usr/java/jre1.6.0*/ /usr/java/jre1.5.0*/ /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.4-sun /usr/lib/jvm/java-gcj /usr/lib/jvm/java-1.5.0-gcj/ /usr/lib/kaffe/pthreads /usr/lib/jvm/java-1.7.0-icedtea-*/ /usr/lib/jvm/jre/ /usr/local/diablo-jdk1.6.0/"
++ JAVA_DEFAULT_DIR="/usr/lib/jvm/default-java/ /usr/lib/jvm/java-6-openjdk/ /usr/lib/jvm/java/ /usr/lib/jvm/java-6-sun/ /usr/lib/j2se/1.6 /usr/java/jdk1.6.0*/ /usr/java/jdk1.5.0*/ /usr/lib/j2sdk1.6-ibm /usr/lib/jvm/java-1.5.0-sun /usr/java/ /usr/lib/j2se/1.5 /usr/lib/j2se/1.4 /usr/java/jre1.6.0*/ /usr/java/jre1.5.0*/ /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.4-sun /usr/lib/jvm/java-gcj /usr/lib/jvm/java-1.5.0-gcj/ /usr/lib/kaffe/pthreads /usr/lib/jvm/java-1.7.0-icedtea-*/ /usr/lib/jvm/jre/ /usr/local/diablo-jdk1.6.0/"
+ for JAVA_HOME in $JAVA_DEFAULT_DIR ; do
+ if test $SCIVERBOSE -ne 0; then
+ echo "Trying to find Java in $JAVA_HOME "
Modified: packages/scilab/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/series?rev=43860&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/series (original)
+++ packages/scilab/trunk/debian/patches/series Sun Sep 4 04:48:06 2011
@@ -6,3 +6,4 @@
modelicac-not-available.diff
0001-Typo-in-the-scilab-adv-cli-desktop-declaration.patch
+default-java-path.diff
More information about the debian-science-commits
mailing list