r37041 - in /packages/scilab/branches/5.3/debian: ./ patches/

sylvestre at users.alioth.debian.org sylvestre at users.alioth.debian.org
Thu Nov 25 06:56:18 UTC 2010


Author: sylvestre
Date: Thu Nov 25 06:56:15 2010
New Revision: 37041

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=37041
Log:
Beta 5

Removed:
    packages/scilab/branches/5.3/debian/patches/addchapter.diff
    packages/scilab/branches/5.3/debian/patches/basename.diff
    packages/scilab/branches/5.3/debian/patches/buildDocPT_BR.diff
    packages/scilab/branches/5.3/debian/patches/ia64jvm.diff
    packages/scilab/branches/5.3/debian/patches/increaseJavaHeap.diff
    packages/scilab/branches/5.3/debian/patches/jhdf2.6.diff
    packages/scilab/branches/5.3/debian/patches/sparcstartup.diff
    packages/scilab/branches/5.3/debian/patches/writable-string.diff
    packages/scilab/branches/5.3/debian/patches/xarmjavadetection.diff
Modified:
    packages/scilab/branches/5.3/debian/control

Modified: packages/scilab/branches/5.3/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.3/debian/control?rev=37041&op=diff
==============================================================================
--- packages/scilab/branches/5.3/debian/control (original)
+++ packages/scilab/branches/5.3/debian/control Thu Nov 25 06:56:15 2010
@@ -107,15 +107,13 @@
  All mandatory libraries for scilab-cli are shipped in this package.
  Please install the package "scilab" to have all features.
 
-<<<<<<< .working
 Package: scilab-full-bin
 Architecture: any
 Depends: ${shlibs:Depends}, scilab-minimal-bin (= ${binary:Version}),
  libflexdock-java, libjogl-java (>= 1.1.1), libjrosetta-java (>= 1.0.1),
- libjlatexmath-java (>= 0.9.3), libjlatexmath-fop-java (>= 0.9.3),
- libjeuclid-core-java, libbatik-java (>= 1.7), fop (>= 0.95),
- libsaxon-java, libavalon-framework-java, docbook-xsl,
- javahelp2, libjgraphx-java (>= 1.4.0.2), libjhdf5-java (>= 2.6), 
+ libjlatexmath-java, libjeuclid-core-java, libbatik-java (>= 1.7), 
+ fop (>= 0.95), libsaxon-java, libavalon-framework-java, docbook-xsl,
+ javahelp2, libjgraphx-java (>= 1.2.0.8), libjhdf5-java (>= 2.6), 
  ${misc:Depends}
 Recommends: pvm
 Replaces: scilab (<< 5.0), scilab-bin
@@ -190,6 +188,7 @@
  from Java.
 
 
+
 Package: libscilab2-java
 Section: java
 Architecture: any
@@ -206,89 +205,9 @@
  This package contains the Java library (version 2) used to call Scilab's engine
  from Java.
 
-=======
-Package: scilab-full-bin
-Architecture: any
-Depends: ${shlibs:Depends}, scilab-minimal-bin (= ${binary:Version}),
- libflexdock-java, libjogl-java (>= 1.1.1), libjrosetta-java (>= 1.0.1),
- libjlatexmath-java, libjeuclid-core-java, libbatik-java (>= 1.7), 
- fop (>= 0.95), libsaxon-java, libavalon-framework-java, docbook-xsl,
- javahelp2, libjgraphx-java (>= 1.2.0.8), libjhdf5-java (>= 2.6), 
- ${misc:Depends}
-Recommends: pvm
-Replaces: scilab (<< 5.0), scilab-bin
-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,
- etc...) and comes with a number of specific toolboxes for
- control, signal processing, ...
- .
- 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
-Priority: extra
-Pre-Depends: ${dpkg:Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, scilab-minimal-bin (>= ${source:Version})
-Suggests: scilab (>= ${source:Version})
-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,
- etc...) and comes with a number of specific toolboxes for
- control, signal processing, ...
- .
- This package contains the architecture specific debugging symbols.
-
-Package: scilab-full-bin-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Pre-Depends: ${dpkg:Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, scilab-full-bin (>= ${source:Version})
-Suggests: scilab (>= ${source:Version})
-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, 
- etc...) and comes with a number of specific toolboxes for 
- control, signal processing, ...
- .
- This package contains the architecture specific debugging symbols.
-
-Package: libscilab-java
-Section: java
-Architecture: any
-Depends: ${shlibs:Depends}, scilab-full-bin (>= ${source:Version}), ${misc:Depends}
-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, 
- etc...) and comes with a number of specific toolboxes for 
- control, signal processing, ...
- .
- This package contains the Java library used to call Scilab's engine 
- from Java.
-
->>>>>>> .merge-right.r37039
 Package: scilab-doc
 Section: doc
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, scilab
 Architecture: all
 Description: Scientific software package (english documentations)
  Scilab is a matrix-based scientific software package.
@@ -299,7 +218,6 @@
  .
  This package contains demos, examples and help pages.
 
-<<<<<<< .working
 Package: scilab-doc-fr
 Section: doc
 Architecture: all
@@ -329,7 +247,7 @@
 
 Package: scilab-test
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, scilab
 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 
@@ -342,46 +260,3 @@
  .
  See Scilab function 'test_run' for usage.
 
-=======
-Package: scilab-doc-fr
-Section: doc
-Architecture: all
-Depends: scilab-doc, ${misc:Depends}
-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, 
- etc...) and comes with a number of specific toolboxes for 
- control, signal processing, ...
- .
- This package contains help pages in French.
-
-Package: scilab-doc-pt-br
-Section: doc
-Architecture: all
-Depends: scilab-doc, ${misc:Depends}
-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, 
- etc...) and comes with a number of specific toolboxes for 
- control, signal processing, ...
- .
- This package contains help pages in Brazilian Portuguese documentation.
-
-
-Package: scilab-test
-Architecture: all
-Depends: ${misc:Depends}
-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, 
- etc...) and comes with a number of specific toolboxes for 
- control, signal processing, ...
- .
- This package contains the test files (unitary, non regression, 
- performance ...) for Scilab.
- .
- See Scilab function 'test_run' for usage.
->>>>>>> .merge-right.r37039




More information about the debian-science-commits mailing list