r36107 - in /packages/scilab/trunk/debian: ./ patches/
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Sun Jan 24 20:44:03 UTC 2010
Author: sylvestre
Date: Sun Jan 24 20:44:02 2010
New Revision: 36107
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36107
Log:
* New packages added: scilab-cli (for command line interpretor), scilab-bin
has been split between scilab-minimal-bin and scilab-full-bin
* Fix syntax error in the changelog
* scilab-data lintian overrides fixed
* lintian overrides added on scilab-test
Added:
packages/scilab/trunk/debian/scilab-adv-cli.1
packages/scilab/trunk/debian/scilab-cli.1
packages/scilab/trunk/debian/scilab-cli.desktop
- copied, changed from r36104, packages/scilab/trunk/debian/scilab.desktop
packages/scilab/trunk/debian/scilab-cli.install
packages/scilab/trunk/debian/scilab-cli.menu
packages/scilab/trunk/debian/scilab-full-bin.install
- copied, changed from r36104, packages/scilab/trunk/debian/scilab-bin.install
packages/scilab/trunk/debian/scilab-full-bin.lintian-overrides
- copied, changed from r36104, packages/scilab/trunk/debian/scilab-bin.lintian-overrides
packages/scilab/trunk/debian/scilab-full-bin.manpages
- copied, changed from r36104, packages/scilab/trunk/debian/scilab-bin.manpages
packages/scilab/trunk/debian/scilab-minimal-bin.install
packages/scilab/trunk/debian/scilab-minimal-bin.lintian-overrides
packages/scilab/trunk/debian/scilab-test.lintian-overrides
Removed:
packages/scilab/trunk/debian/scilab-bin.install
packages/scilab/trunk/debian/scilab-bin.lintian-overrides
packages/scilab/trunk/debian/scilab-bin.manpages
Modified:
packages/scilab/trunk/debian/TODO
packages/scilab/trunk/debian/changelog
packages/scilab/trunk/debian/control
packages/scilab/trunk/debian/patches/librarypath.diff
packages/scilab/trunk/debian/rules
packages/scilab/trunk/debian/scilab-data.lintian-overrides
packages/scilab/trunk/debian/scilab.install
packages/scilab/trunk/debian/scilab.manpages
packages/scilab/trunk/debian/scilab.menu
Modified: packages/scilab/trunk/debian/TODO
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/TODO?rev=36107&op=diff
==============================================================================
--- packages/scilab/trunk/debian/TODO (original)
+++ packages/scilab/trunk/debian/TODO Sun Jan 24 20:44:02 2010
@@ -1,6 +1,6 @@
* See what to do with localization files
-* Create a binary package (scilab-cli) which doesn't need java
* Use atlas by default instead of blas
* Create a package for the pt_BR help
* create a dedicated package for xcos ?
-
+* create a libscilab-jni package with jni stuff in it
+* split scilab-data between scilab-minimal-data & scilab-full-data
Modified: packages/scilab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/changelog?rev=36107&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Sun Jan 24 20:44:02 2010
@@ -1,3 +1,13 @@
+scilab (5.2.0-4) unstable; urgency=low
+
+ * New packages added: scilab-cli (for command line interpretor), scilab-bin
+ has been split between scilab-minimal-bin and scilab-full-bin
+ * Fix syntax error in the changelog
+ * scilab-data lintian overrides fixed
+ * lintian overrides added on scilab-test
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sun, 24 Jan 2010 15:33:47 +0100
+
scilab (5.2.0-3) unstable; urgency=low
* Explicit dependency on scilab-sivp (>= 5.0.0) (Closes: #561856)
@@ -257,226 +267,6 @@
-- Sylvestre Ledru <sylvestre.ledru at inria.fr> Wed, 10 Sep 2008 13:35:28 +0200
-=======
-scilab (5.1.1-11) unstable; urgency=low
-
- * In the version 5.1.1-10, I changed a mv by a cp and it caused the help
- file to be stored in both packages (Closes: #547624)
-
- -- Sylvestre Ledru <sylvestre at debian.org> Mon, 21 Sep 2009 10:18:54 +0200
-
-scilab (5.1.1-10) unstable; urgency=low
-
- * Do not build the help on arch != amd64/i386. Waiting for upstream to
- improve the build time
- * Force the dependency on openjdk-6-jre | sun-java6-jre on scilab-bin to
- make sure that libjava is available (Closes: #538359)
-
- -- Sylvestre Ledru <sylvestre at debian.org> Sat, 19 Sep 2009 14:13:52 +0200
-
-scilab (5.1.1-9) unstable; urgency=low
-
- * mipsel and armel management added (z_mipsel_arm_mgmt.diff patch added)
-
- -- Sylvestre Ledru <sylvestre at debian.org> Wed, 09 Sep 2009 00:28:10 +0200
-
-scilab (5.1.1-8) unstable; urgency=low
-
- * Update libs_by_debian.m4 which is the libs.m4 of autoconf 2.64
- (bug reported upstream) (LP: #414410)
- * Removal of Torsten on his request (Thanks for everything)
- * Standards-Version updated to 3.8.3
- * DM-Upload-Allowed removed
-
- -- Sylvestre Ledru <sylvestre at debian.org> Sun, 30 Aug 2009 11:07:45 +0200
-
-scilab (5.1.1-7) unstable; urgency=low
-
- [ Sylvestre Ledru ]
- * Change of my email address since I am now DD \o/
- * Better processing with the removal of the rpath
- * dh_desktop call removed
- * Standards-Version updated to 3.8.2
- * Force the minimal version of suitesparse to 3.4.0-1. This version
- introduced new binary packages (libumfpack and libamd here)
-
- [ Christoph Korn ]
- * debian/control:
- * Set libscilab-java as architecture independent because it only
- contains a jar file.
- * Added scilab-bin-dbg as debugging package. CDBS should do the rest.
- * debian/rules:
- * Moved the install code for icons from "binary-install/libscilab-java::"
- target to "install/scilab::" target.
-
- -- Sylvestre Ledru <sylvestre at debian.org> Fri, 14 Aug 2009 16:06:35 +0200
-
-scilab (5.1.1-6) unstable; urgency=low
-
- * better install which should really fix the previous bug
- (Closes: #528517)
- * More feedbacks on the java detection (z_java_debug.diff)
- * Enable a default case on the startup about the java detection
- (javaruntimedetection.diff)
-
- -- Sylvestre Ledru <sylvestre.ledru at inria.fr> Thu, 14 May 2009 16:38:17 +0200
-
-scilab (5.1.1-5) unstable; urgency=low
-
- * install/scilab wasn't called when building binary for other archs.
- Therefor not installing correctly everything (Closes: #528517)
- * A bad define was causing a silly include (alphabuild.diff)
- * uname -m is returning s390x on some s390 archs (s390javadetection.diff)
- * manpage of modelicac updated with the information about the
- availability of this binary
-
- -- Sylvestre Ledru <sylvestre.ledru at inria.fr> Wed, 13 May 2009 14:12:23 +0200
-
-scilab (5.1.1-4) unstable; urgency=low
-
- * librefblas3-dev does not exist (yet). Thanks to Jose Ramon
- * Do not stop when ocamlopt is not available on the arch
- (ocaml-not-available.diff)
- * Provide a clear error message for archs where modelicac compiler is
- not available (modelicac-not-available.diff)
- * scilab startup script moved from package scilab => scilab-bin (because of
- the ocamlopt problem, I cannot predict if modelicac will be available or
- not. Therefor, I ship usr/bin/ instead of binary per binary. This will
- also simplifies the packaging of Scilab 5.2)
-
- -- Sylvestre Ledru <sylvestre.ledru at inria.fr> Tue, 28 Apr 2009 18:47:03 +0200
-
-scilab (5.1.1-3) unstable; urgency=low
-
- * Fix warnings in the manpages (modelicac.1 & scilab.1)
- * Fix a few typo in the code (typo.diff)
- * Remove some exit() in some libs of Scilab (exitincode.diff)
- * Encoding removed from scilab.desktop (it is now the default encoding)
- * call_scilab documentation was not correctly loaded (missingaddchapter.diff)
- * change of the order of the dependencies of the numerical deps (didn't work
- buildd) (Closes: #525935)
- * Build-dep atlas3-base-dev renamed to libatlas-base-dev
-
- -- Sylvestre Ledru <sylvestre.ledru at inria.fr> Mon, 27 Apr 2009 14:51:57 +0200
-
-scilab (5.1.1-2) unstable; urgency=low
-
- * More windows-devel-file-in-package lintian ignored
- * libscilab-java is now in Section: java
- * Upload in unstable
- * Standards-Version updated to 3.8.1
- * compat & debhelpder dep updated from 4 => 7
-
- -- Sylvestre Ledru <sylvestre.ledru at inria.fr> Wed, 22 Apr 2009 14:58:37 +0200
-
-scilab (5.1.1-1) experimental; urgency=low
-
- [ Christoph Korn ]
- * New upstream version.
- (patches 64bitsdetection.diff filesWithSpace.diff javaHeadLess.diff
- displayStack.diff xmlCleanupParser.diff removed. Applied upstream)
-
- [ Sylvestre Ledru ]
- * Add a patch to manage powerpc detection of the JVM (jvm-powerpc.diff)
- * Add a patch to use only fpu_control under Linux & x86 (fpu_control.diff)
-
- -- Sylvestre Ledru <sylvestre.ledru at inria.fr> Sun, 19 Apr 2009 16:42:49 +0200
-
-scilab (5.1-2) experimental; urgency=low
-
- [ Sylvestre Ledru ]
- * Package scilab-include added (was missing in the previous version)
- * sivp added in the recommanded packages (Closes: #505203)
- * Replaces: scilab (< 5.0) added in scilab-bin (caused issue in the 4.X
- => 5.X upgrade)
- * Patch xmlCleanupParser.diff added (fix some problems with the latest
- version of libxml... which is not yet present in Debian).
- * Add a lintian override for some visual project files
- * Copyright update about javasci's examples (public domain now)
- * Missing deps on docbook-xsl for scilab-doc
-
- [ Christoph Korn ]
- * debian/patches/filesWithSpace.diff: Removes a space in two filenames.
- * debian/rules: Remove empty translation files (Closes LP: #272264)
-
- -- Sylvestre Ledru <sylvestre.ledru at inria.fr> Tue, 24 Feb 2009 11:38:38 +0100
-
-scilab (5.1-1) experimental; urgency=low
-
- * New upstream release
- * Some patches removed (included upstream)
- * Better watch file
- * Missing dep to pkg-config
- * Patch javaHeadLess.diff added (build Scilab into a chroot)
- * Patch 64bitsdetection.diff added (better detection of a 64 bits CPU)
-
- [ Christoph Korn ]
- * ${misc:Depends} added to make lintian happy
- * deleted debian/patches/series because quilt is not used as patch system
- * Dropped g++ build dependency to make lintian happy.
- * debian/control: Changed the unique package descriptions to
- make lintian happy.
-
- -- Sylvestre Ledru <sylvestre.ledru at inria.fr> Fri, 13 Feb 2009 09:44:31 +0100
-
-scilab (5.0.3-6) experimental; urgency=low
-
- * Integration of a patch to be able to build french without the locale
-
- -- Sylvestre Ledru <sylvestre.ledru at inria.fr> Wed, 21 Jan 2009 16:52:36 +0100
-
-scilab (5.0.3-5) experimental; urgency=low
-
- * Add a backported patch from upstream to be able to build the
- documentation without the french localization installed on the
- system
-
- -- Sylvestre Ledru <sylvestre.ledru at inria.fr> Wed, 28 Jan 2009 14:02:06 +0100
-
-scilab (5.0.3-4) experimental; urgency=low
-
- * scilab.desktop wasn't install (thanks again to Christoph Korn) and
- and the categories were wrong
-
- -- Sylvestre Ledru <sylvestre.ledru at inria.fr> Wed, 07 Jan 2009 12:57:24 +0100
-
-scilab (5.0.3-3) experimental; urgency=low
-
- * Missing dep to ant & docbook-xsl
- * Information about the LGPL added in the copyright file
- * Force a minimal version of jeuclid
- * Install the icon
- * Fix a problem in the scilab.desktop file (thanks to Christoph Korn)
- * Icons added to the menu item
-
- -- Sylvestre Ledru <sylvestre.ledru at inria.fr> Tue, 30 Dec 2008 09:38:59 +0100
-
-scilab (5.0.3-2) experimental; urgency=medium
-
- * Warnings removed on startup
- * Tests moved to scilab-test package
-
- -- Sylvestre Ledru <sylvestre.ledru at inria.fr> Sat, 22 Nov 2008 10:28:30 +0100
-
-scilab (5.0.3-1) experimental; urgency=medium
-
- * New upstream version (Closes: #483682, #499565, #486876)
- Massive changes in the package construction
- * Package moved to main since Scilab is free (CeCILL license)
- * modelicac, intersci and scilab manpages added
-
- -- Sylvestre Ledru <sylvestre.ledru at inria.fr> Fri, 1 Oct 2008 13:37:08 +0200
-
-scilab (4.1.2-6) unstable; urgency=low
-
- * Debian-science added as maintainer
- * SVN moved to debian-science repository
- * Standards-Version updated to 3.8.0
- * Fix a security issue reported by Dmitry E. Oboukhov. (Closes: #496414)
-
- -- Sylvestre Ledru <sylvestre.ledru at inria.fr> Wed, 10 Sep 2008 13:35:28 +0200
-
->>>>>>> .fusion-droit.r35957
scilab (4.1.2-5) unstable; urgency=low
* Add DM-Upload-Allowed: yes to enable uploads for Sylvestre.
Modified: packages/scilab/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/control?rev=36107&op=diff
==============================================================================
--- packages/scilab/trunk/debian/control (original)
+++ packages/scilab/trunk/debian/control Sun Jan 24 20:44:02 2010
@@ -28,9 +28,9 @@
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/scilab/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/scilab/trunk/
-Package: scilab
-Architecture: all
-Depends: scilab-bin (>= ${source:Version}),
+Package: scilab-cli
+Architecture: all
+Depends: scilab-minimal-bin (>= ${source:Version}),
scilab-data (= ${binary:Version}), ${misc:Depends},
scilab-include (= ${binary:Version})
# scilab-include is installed by default since it is widely used by many
@@ -38,11 +38,24 @@
Recommends: scilab-doc (= ${binary:Version}), scilab-sivp (>= 5.0.0)
Suggests: gfortran, gcc, scilab-swt, scilab-scimax, scilab-plotlib, scilab-ann
# For the dynamic link
+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,
+ etc...) and comes with a number of specific toolboxes for
+ control, signal processing, ...
+ .
+ This package provides Scilab as Command Line Interpreter (CLI). Please install
+ the package "scilab" to have all features.
+
+Package: scilab
+Architecture: all
+Depends: scilab-cli (>= ${source:Version}), ${misc:Depends}
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,
- etc...) and comes with a number of specific toolboxes for
+ 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, ...
.
@@ -72,21 +85,34 @@
This package contains the include files for Scilab (used in the dynamic link).
-Package: scilab-bin
+Package: scilab-minimal-bin
Architecture: any
Depends: ${shlibs:Depends}, scilab-data (= ${source:Version}),
- openjdk-6-jre | sun-java6-jre,
+ ${misc:Depends}
+Replaces: scilab-bin
+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,
+ etc...) and comes with a number of specific toolboxes for
+ control, signal processing, ...
+ .
+ This package contains the architecture specific binary files.
+
+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,
+ libjlatexmath-java,
javahelp2, ${misc:Depends},
libjgraphx-java (>= 1.2.0.7), libjhdf5-java (>= 2.6)
Recommends: pvm
-Replaces: scilab (< 5.0)
-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
+Replaces: scilab (<< 5.0), scilab-bin
+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,
+ etc...) and comes with a number of specific toolboxes for
control, signal processing, ...
.
This package contains the architecture specific binary files.
@@ -104,15 +130,31 @@
# .
# This package contains the architecture specific binary files.
-Package: scilab-bin-dbg
+Package: scilab-minimal-bin-dbg
Architecture: any
Section: debug
Priority: extra
Pre-Depends: ${dpkg:Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, scilab-bin (>= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, scilab-minimal-bin (>= ${source:Version})
Suggests: scilab (>= ${source:Version})
Description: Scientific software package for numerical computations (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 for numerical computations (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
@@ -123,7 +165,7 @@
Package: libscilab-java
Section: java
Architecture: all
-Depends: ${shlibs:Depends}, scilab-bin (>= ${source:Version}), ${misc:Depends}
+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
Modified: packages/scilab/trunk/debian/patches/librarypath.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/librarypath.diff?rev=36107&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/librarypath.diff (original)
+++ packages/scilab/trunk/debian/patches/librarypath.diff Sun Jan 24 20:44:02 2010
@@ -17,3 +17,41 @@
if test $SCIVERBOSE -ne 0; then
echo "LD_LIBRARY_PATH : $LD_LIBRARY_PATH"
+--- bin/scilab-cli.orig 2009-02-13 10:12:45.000000000 +0100
++++ bin/scilab-cli 2009-02-13 10:14:06.000000000 +0100
+@@ -439,7 +439,7 @@
+ #export PVM_ARCH
+
+ SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/
+-LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
++#LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
+
+ case $OS in
+ *darwin* | *Darwin*) # MacOS X
+@@ -453,6 +453,7 @@
+ *)
+ esac
+
++LD_LIBRARY_PATH=/usr/lib/scilab/:/usr/lib64/scilab/:$LD_LIBRARY_PATH
+
+ if test $SCIVERBOSE -ne 0; then
+ echo "LD_LIBRARY_PATH : $LD_LIBRARY_PATH"
+--- bin/scilab-adv-cli.orig 2009-02-13 10:12:45.000000000 +0100
++++ bin/scilab-adv-cli 2009-02-13 10:14:06.000000000 +0100
+@@ -439,7 +439,7 @@
+ #export PVM_ARCH
+
+ SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/
+-LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
++#LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
+
+ case $OS in
+ *darwin* | *Darwin*) # MacOS X
+@@ -453,6 +453,7 @@
+ *)
+ esac
+
++LD_LIBRARY_PATH=/usr/lib/scilab/:/usr/lib64/scilab/:$LD_LIBRARY_PATH
+
+ if test $SCIVERBOSE -ne 0; then
+ echo "LD_LIBRARY_PATH : $LD_LIBRARY_PATH"
Modified: packages/scilab/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/rules?rev=36107&op=diff
==============================================================================
--- packages/scilab/trunk/debian/rules (original)
+++ packages/scilab/trunk/debian/rules Sun Jan 24 20:44:02 2010
@@ -38,7 +38,8 @@
sharedir=$(DEB_DESTDIR)/usr/share/ \
docdir=$(DEB_DESTDIR)/usr/share/doc/
-DEB_DH_MAKESHLIBS_ARGS_scilab-bin = -n
+DEB_DH_MAKESHLIBS_ARGS_scilab-full-bin = -n
+DEB_DH_MAKESHLIBS_ARGS_scilab-minimal-bin = -n
#DEB_MAKE_CHECK_TARGET = check
@@ -102,22 +103,37 @@
mv debian/tmp/usr/share/scilab/modules/javasci/jar/javasci.jar $(CURDIR)/debian/libscilab-java/usr/share/java/
rmdir debian/tmp/usr/share/scilab/modules/javasci/jar/
-binary-install/scilab-bin::
-# Remove rpath
- for file in $(DEB_DESTDIR)/usr/bin/scilab-bin $(DEB_DESTDIR)/usr/bin/intersci; do \
- chrpath -d $$file; \
- done
+
+binary-install/scilab-minimal-bin::
for file in $(DEB_DESTDIR)/usr/lib/scilab/*.so; do \
chrpath -d $$file; \
done
+ for file in $(DEB_DESTDIR)/usr/bin/scilab-cli-bin; do \
+ chrpath -d $$file; \
+ done
+
+ mkdir -p $(CURDIR)/debian/scilab-minimal-bin/usr/bin
+ mv $(CURDIR)/debian/tmp/usr/bin/scilab-cli-bin $(CURDIR)/debian/scilab-minimal-bin/usr/bin/
+
+binary-install/scilab-full-bin::
+# Remove rpath
+ for file in $(DEB_DESTDIR)/usr/bin/scilab-bin $(DEB_DESTDIR)/usr/bin/intersci; do \
+ chrpath -d $$file; \
+ done
+
# Move binaries
- mkdir -p $(CURDIR)/debian/scilab-bin/usr/bin
- mv $(CURDIR)/debian/tmp/usr/bin/scilab-bin $(CURDIR)/debian/tmp/usr/bin/intersci $(CURDIR)/debian/scilab-bin/usr/bin/
+ mkdir -p $(CURDIR)/debian/scilab-full-bin/usr/bin
+ mv $(CURDIR)/debian/tmp/usr/bin/scilab-bin $(CURDIR)/debian/tmp/usr/bin/intersci $(CURDIR)/debian/scilab-full-bin/usr/bin/
if test -s $(CURDIR)/debian/tmp/usr/bin/modelicac; then \
chrpath -d $(CURDIR)/debian/tmp/usr/bin/modelicac; \
- mv $(CURDIR)/debian/tmp/usr/bin/modelicac $(CURDIR)/debian/scilab-bin/usr/bin/; \
+ mv $(CURDIR)/debian/tmp/usr/bin/modelicac $(CURDIR)/debian/scilab-full-bin/usr/bin/; \
fi
+
+install/scilab-cli::
+# Move icons
+ mkdir -p $(CURDIR)/debian/scilab-cli/usr/share/scilab-cli/icons/
+ cp -R debian/tmp/usr/share/scilab/icons/scilab.xpm $(CURDIR)/debian/scilab-cli/usr/share/scilab-cli/icons/
install/scilab::
# Move icons
Added: packages/scilab/trunk/debian/scilab-adv-cli.1
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/scilab-adv-cli.1?rev=36107&op=file
==============================================================================
--- packages/scilab/trunk/debian/scilab-adv-cli.1 (added)
+++ packages/scilab/trunk/debian/scilab-adv-cli.1 Sun Jan 24 20:44:02 2010
@@ -1,0 +1,77 @@
+.TH "Scilab" "1" "November 18, 2008"
+.SH NAME
+scilab-adv-cli \- Scientific software package - Advanced Command Line Interpreter
+.SH SYNOPSIS
+.B scilab [ -h | -f file | -e instruction | -l lang | -mem n | -nb | -ns | -nouserstartup | -version ]
+.br
+This manual page documents briefly the
+.B scilab
+commands.
+scilab-adv-cli provides Scilab as a computing engine with many features.
+It is similar to call scilab -nw. All options of Scilab are available in
+this mode.
+.PP
+.SH OPTIONS
+A complete list of options is included below.
+.TP
+.B \-h
+Show the list of options.
+.TP
+.B \-f file
+Execute the scilab script given in
+.B file
+argument.
+Not that \-e and \-f options are mutually exclusive.
+.TP
+.B \-e instruction
+Execute the scilab instruction given in
+.B instruction
+argument.
+Not that \-e and \-f options are mutually exclusive.
+.TP
+.B \-l lang
+Launch Scilab in the specified language. The lang must be the locale code
+(ie fr_FR, en_US...)
+.TP
+.B \-nb
+Do not display the Scilab banner at starting time.
+.TP
+.B \-ns
+Do not execute scilab.start startup file
+.TP
+.B \-mem N
+Set the initial stacksize
+.TP
+.B \-nouserstartup
+Do not execute the user startup files SCIHOME/.scilab or SCIHOME/scilab.ini.
+.TP
+.B \-version
+Print product version and exit.
+.SH FILES
+.IR ~/.Scilab/<Scilab_version>/.scilab
+The user startup script.
+.br
+.IR ~/.Scilab/<Scilab_version>/scilab.ini
+The user startup script.
+.br
+.IR ~/.Scilab/<Scilab_version>/configuration.xml
+The configuration of the GUI
+.br
+.IR ~/.Scilab/<Scilab_version>/.history.scilab
+The history of commands
+.br
+.IR SCI/modules/jvm/etc/jvm_options.xml
+Options given to the JVM
+.br
+.IR SCI/etc/modules.xml
+List of Scilab modules
+.br
+.IR SCI/etc/classpath.xml
+Where Scilab should load the Java libraries
+.br
+.IR SCI/etc/librarypath.xml
+Where Scilab should look for JNI libraries
+.SH AUTHOR
+Scilab was written by the Scilab Consortium.
+.PP
+This manual page was written by Sylvestre Ledru <sylvestre.ledru at inria.fr>.
Added: packages/scilab/trunk/debian/scilab-cli.1
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/scilab-cli.1?rev=36107&op=file
==============================================================================
--- packages/scilab/trunk/debian/scilab-cli.1 (added)
+++ packages/scilab/trunk/debian/scilab-cli.1 Sun Jan 24 20:44:02 2010
@@ -1,0 +1,77 @@
+.TH "Scilab" "1" "November 18, 2008"
+.SH NAME
+scilab-cli \- Scientific software package - Command Line Interpreter
+.SH SYNOPSIS
+.B scilab [ -h | -f file | -e instruction | -l lang | -mem n | -nb | -ns | -nouserstartup | -version ]
+.br
+This manual page documents briefly the
+.B scilab
+commands.
+scilab-cli provides Scilab as a computing engine. It is similar to call
+scilab -nwni. Somes features are disabled in this mode
+(graphic, GUI, Xcos...).
+.PP
+.SH OPTIONS
+A complete list of options is included below.
+.TP
+.B \-h
+Show the list of options.
+.TP
+.B \-f file
+Execute the scilab script given in
+.B file
+argument.
+Not that \-e and \-f options are mutually exclusive.
+.TP
+.B \-e instruction
+Execute the scilab instruction given in
+.B instruction
+argument.
+Not that \-e and \-f options are mutually exclusive.
+.TP
+.B \-l lang
+Launch Scilab in the specified language. The lang must be the locale code
+(ie fr_FR, en_US...)
+.TP
+.B \-nb
+Do not display the Scilab banner at starting time.
+.TP
+.B \-ns
+Do not execute scilab.start startup file
+.TP
+.B \-mem N
+Set the initial stacksize
+.TP
+.B \-nouserstartup
+Do not execute the user startup files SCIHOME/.scilab or SCIHOME/scilab.ini.
+.TP
+.B \-version
+Print product version and exit.
+.SH FILES
+.IR ~/.Scilab/<Scilab_version>/.scilab
+The user startup script.
+.br
+.IR ~/.Scilab/<Scilab_version>/scilab.ini
+The user startup script.
+.br
+.IR ~/.Scilab/<Scilab_version>/configuration.xml
+The configuration of the GUI
+.br
+.IR ~/.Scilab/<Scilab_version>/.history.scilab
+The history of commands
+.br
+.IR SCI/modules/jvm/etc/jvm_options.xml
+Options given to the JVM
+.br
+.IR SCI/etc/modules.xml
+List of Scilab modules
+.br
+.IR SCI/etc/classpath.xml
+Where Scilab should load the Java libraries
+.br
+.IR SCI/etc/librarypath.xml
+Where Scilab should look for JNI libraries
+.SH AUTHOR
+Scilab was written by the Scilab Consortium.
+.PP
+This manual page was written by Sylvestre Ledru <sylvestre.ledru at inria.fr>.
Copied: packages/scilab/trunk/debian/scilab-cli.desktop (from r36104, packages/scilab/trunk/debian/scilab.desktop)
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/scilab-cli.desktop?rev=36107&op=diff
==============================================================================
--- packages/scilab/trunk/debian/scilab.desktop (original)
+++ packages/scilab/trunk/debian/scilab-cli.desktop Sun Jan 24 20:44:02 2010
@@ -2,14 +2,14 @@
Comment=Scientific software package for numerical computations
Comment[fr]=Logiciel scientifique de calcul numérique
Comment[de]=eine Wissenschaftssoftware für numerische Berechnungen
-Exec=scilab
+Exec=scilab-cli
GenericName=Scientific Software Package
GenericName[fr]=Logiciel de calcul numérique
GenericName[de]=Wissenschaftssoftware
-Icon=/usr/share/scilab/icons/scilab.xpm
-Name=Scilab
-Name[de]=Scilab
+Icon=/usr/share/scilab-cli/icons/scilab.xpm
+Name=Scilab-cli
+Name[de]=Scilab-cli
StartupNotify=false
-Terminal=false
+Terminal=true
Type=Application
Categories=Education;Science;Math;Development;Physics;
Added: packages/scilab/trunk/debian/scilab-cli.install
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/scilab-cli.install?rev=36107&op=file
==============================================================================
--- packages/scilab/trunk/debian/scilab-cli.install (added)
+++ packages/scilab/trunk/debian/scilab-cli.install Sun Jan 24 20:44:02 2010
@@ -1,0 +1,1 @@
+debian/tmp/usr/bin/scilab-cli
Added: packages/scilab/trunk/debian/scilab-cli.menu
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/scilab-cli.menu?rev=36107&op=file
==============================================================================
--- packages/scilab/trunk/debian/scilab-cli.menu (added)
+++ packages/scilab/trunk/debian/scilab-cli.menu Sun Jan 24 20:44:02 2010
@@ -1,0 +1,6 @@
+?package(scilab-cli):\
+ needs="text"\
+ section="Applications/Science/Mathematics"\
+ icon="/usr/share/scilab-cli/icons/scilab.xpm" \
+ title="Scilab"\
+ command="/usr/bin/scilab-cli"
Modified: packages/scilab/trunk/debian/scilab-data.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/scilab-data.lintian-overrides?rev=36107&op=diff
==============================================================================
--- packages/scilab/trunk/debian/scilab-data.lintian-overrides (original)
+++ packages/scilab/trunk/debian/scilab-data.lintian-overrides Sun Jan 24 20:44:02 2010
@@ -13,3 +13,5 @@
scilab-data: windows-devel-file-in-package usr/share/scilab/modules/call_scilab/examples/call_scilab/c/visual_studio/CallSciVC.sln
scilab-data: windows-devel-file-in-package usr/share/scilab/modules/call_scilab/examples/call_scilab/c/visual_studio/CallSciVC.vcproj
scilab-data: windows-devel-file-in-package usr/share/scilab/modules/call_scilab/examples/call_scilab/fortran/example.sln
+scilab-data: windows-devel-file-in-package usr/share/scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/VB.NET.sln
+scilab-data: windows-devel-file-in-package usr/share/scilab/modules/call_scilab/examples/call_scilab/NET/C#/DotNetScilab.sln
Copied: packages/scilab/trunk/debian/scilab-full-bin.install (from r36104, packages/scilab/trunk/debian/scilab-bin.install)
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/scilab-full-bin.install?rev=36107&op=diff
==============================================================================
--- packages/scilab/trunk/debian/scilab-bin.install (original)
+++ packages/scilab/trunk/debian/scilab-full-bin.install Sun Jan 24 20:44:02 2010
@@ -1,1 +1,11 @@
-debian/tmp/usr/lib/
+debian/tmp/usr/lib/scilab/libsciconsole.*
+debian/tmp/usr/lib/scilab/libscigraphic_export.*
+debian/tmp/usr/lib/scilab/libscigraphics.*
+debian/tmp/usr/lib/scilab/libscigui.*
+debian/tmp/usr/lib/scilab/libscihdf5-forceload.*
+debian/tmp/usr/lib/scilab/libscijvm.*
+debian/tmp/usr/lib/scilab/libscilab.*
+debian/tmp/usr/lib/scilab/libscirenderer.*
+debian/tmp/usr/lib/scilab/libscixcos.*
+debian/tmp/usr/lib/scilab/libscixpad.*
+
Copied: packages/scilab/trunk/debian/scilab-full-bin.lintian-overrides (from r36104, packages/scilab/trunk/debian/scilab-bin.lintian-overrides)
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/scilab-full-bin.lintian-overrides?rev=36107&op=diff
==============================================================================
--- packages/scilab/trunk/debian/scilab-bin.lintian-overrides (original)
+++ packages/scilab/trunk/debian/scilab-full-bin.lintian-overrides Sun Jan 24 20:44:02 2010
@@ -1,2 +1,2 @@
# the actual binary which should not be called directly
-scilab-bin: binary-without-manpage usr/bin/scilab-bin
+scilab-full-bin: binary-without-manpage usr/bin/scilab-bin
Copied: packages/scilab/trunk/debian/scilab-full-bin.manpages (from r36104, packages/scilab/trunk/debian/scilab-bin.manpages)
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/scilab-full-bin.manpages?rev=36107&op=diff
==============================================================================
--- packages/scilab/trunk/debian/scilab-bin.manpages (original)
+++ packages/scilab/trunk/debian/scilab-full-bin.manpages Sun Jan 24 20:44:02 2010
@@ -1,3 +1,2 @@
debian/intersci.1
debian/modelicac.1
-
Added: packages/scilab/trunk/debian/scilab-minimal-bin.install
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/scilab-minimal-bin.install?rev=36107&op=file
==============================================================================
--- packages/scilab/trunk/debian/scilab-minimal-bin.install (added)
+++ packages/scilab/trunk/debian/scilab-minimal-bin.install Sun Jan 24 20:44:02 2010
@@ -1,0 +1,66 @@
+debian/tmp/usr/lib/scilab/libmat.*
+debian/tmp/usr/lib/scilab/libmex.*
+debian/tmp/usr/lib/scilab/libmx.*
+debian/tmp/usr/lib/scilab/libsciaction_binding.*
+debian/tmp/usr/lib/scilab/libsciapi_scilab.*
+debian/tmp/usr/lib/scilab/libsciarnoldi.*
+debian/tmp/usr/lib/scilab/libsciboolean.*
+debian/tmp/usr/lib/scilab/libscicacsd.*
+debian/tmp/usr/lib/scilab/libscicall_scilab.*
+debian/tmp/usr/lib/scilab/libscicompletion.*
+debian/tmp/usr/lib/scilab/libsciconsole-disable.*
+debian/tmp/usr/lib/scilab/libscicore.*
+debian/tmp/usr/lib/scilab/libscidata_structures.*
+debian/tmp/usr/lib/scilab/libscidifferential_equations.*
+debian/tmp/usr/lib/scilab/libscidouble.*
+debian/tmp/usr/lib/scilab/libscidoublylinkedlist.*
+debian/tmp/usr/lib/scilab/libscidynamiclibrary.*
+debian/tmp/usr/lib/scilab/libscidynamic_link.*
+debian/tmp/usr/lib/scilab/libscielementary_functions.*
+debian/tmp/usr/lib/scilab/libscifftw.*
+debian/tmp/usr/lib/scilab/libscifileio.*
+debian/tmp/usr/lib/scilab/libscifunctions.*
+debian/tmp/usr/lib/scilab/libscigraphic_export-disable.*
+debian/tmp/usr/lib/scilab/libscigraphics-disable.*
+debian/tmp/usr/lib/scilab/libscigui-disable.*
+debian/tmp/usr/lib/scilab/libscihashtable.*
+debian/tmp/usr/lib/scilab/libscihdf5-forceload-disable.*
+debian/tmp/usr/lib/scilab/libscihdf5.*
+debian/tmp/usr/lib/scilab/libscihelptools.*
+debian/tmp/usr/lib/scilab/libscihistory_manager.*
+debian/tmp/usr/lib/scilab/libsciinteger.*
+debian/tmp/usr/lib/scilab/libsciinterpolation.*
+debian/tmp/usr/lib/scilab/libsciintersci.*
+debian/tmp/usr/lib/scilab/libsciio.*
+debian/tmp/usr/lib/scilab/libscijvm-disable.*
+debian/tmp/usr/lib/scilab/libscilab-cli.*
+debian/tmp/usr/lib/scilab/libscilibst.*
+debian/tmp/usr/lib/scilab/libscilinear_algebra.*
+debian/tmp/usr/lib/scilab/libscilocalization.*
+debian/tmp/usr/lib/scilab/libscimalloc.*
+debian/tmp/usr/lib/scilab/libscimatio.*
+debian/tmp/usr/lib/scilab/libscioptimization.*
+debian/tmp/usr/lib/scilab/libscioutput_stream.*
+debian/tmp/usr/lib/scilab/libscipolynomials.*
+debian/tmp/usr/lib/scilab/libscipvm.*
+debian/tmp/usr/lib/scilab/libscirandlib.*
+debian/tmp/usr/lib/scilab/libscirenderer-disable.*
+debian/tmp/usr/lib/scilab/libsciscicos_blocks.*
+debian/tmp/usr/lib/scilab/libsciscicos.*
+debian/tmp/usr/lib/scilab/libscishell.*
+debian/tmp/usr/lib/scilab/libscisignal_processing.*
+debian/tmp/usr/lib/scilab/libscisound.*
+debian/tmp/usr/lib/scilab/libscisparse.*
+debian/tmp/usr/lib/scilab/libscispecial_functions.*
+debian/tmp/usr/lib/scilab/libscispreadsheet.*
+debian/tmp/usr/lib/scilab/libscistatistics.*
+debian/tmp/usr/lib/scilab/libscistring.*
+debian/tmp/usr/lib/scilab/libscisundials.*
+debian/tmp/usr/lib/scilab/libscisymbolic.*
+debian/tmp/usr/lib/scilab/libscitclsci.*
+debian/tmp/usr/lib/scilab/libscitime.*
+debian/tmp/usr/lib/scilab/libsciumfpack.*
+debian/tmp/usr/lib/scilab/libsciwindows_tools.*
+debian/tmp/usr/lib/scilab/libscixcos-disable.*
+debian/tmp/usr/lib/scilab/libscixpad-disable.*
+debian/tmp/usr/lib/pkgconfig/
Added: packages/scilab/trunk/debian/scilab-minimal-bin.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/scilab-minimal-bin.lintian-overrides?rev=36107&op=file
==============================================================================
--- packages/scilab/trunk/debian/scilab-minimal-bin.lintian-overrides (added)
+++ packages/scilab/trunk/debian/scilab-minimal-bin.lintian-overrides Sun Jan 24 20:44:02 2010
@@ -1,0 +1,2 @@
+# the actual binary which should not be called directly
+scilab-minimal-bin: binary-without-manpage usr/bin/scilab-cli-bin
Added: packages/scilab/trunk/debian/scilab-test.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/scilab-test.lintian-overrides?rev=36107&op=file
==============================================================================
--- packages/scilab/trunk/debian/scilab-test.lintian-overrides (added)
+++ packages/scilab/trunk/debian/scilab-test.lintian-overrides Sun Jan 24 20:44:02 2010
@@ -1,0 +1,3 @@
+# It is for testing purposes only
+scilab-test: duplicate-font-file usr/share/scilab/modules/graphics/tests/unit_tests/DejaVuSansMono.ttf also in ttf-dejavu-core
+
Modified: packages/scilab/trunk/debian/scilab.install
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/scilab.install?rev=36107&op=diff
==============================================================================
--- packages/scilab/trunk/debian/scilab.install (original)
+++ packages/scilab/trunk/debian/scilab.install Sun Jan 24 20:44:02 2010
@@ -1,2 +1,3 @@
debian/tmp/usr/bin/scilab
+debian/tmp/usr/bin/scilab-adv-cli
debian/scilab.desktop usr/share/applications
Modified: packages/scilab/trunk/debian/scilab.manpages
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/scilab.manpages?rev=36107&op=diff
==============================================================================
--- packages/scilab/trunk/debian/scilab.manpages (original)
+++ packages/scilab/trunk/debian/scilab.manpages Sun Jan 24 20:44:02 2010
@@ -1,1 +1,2 @@
debian/scilab.1
+debian/scilab-adv-cli.1
Modified: packages/scilab/trunk/debian/scilab.menu
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/scilab.menu?rev=36107&op=diff
==============================================================================
--- packages/scilab/trunk/debian/scilab.menu (original)
+++ packages/scilab/trunk/debian/scilab.menu Sun Jan 24 20:44:02 2010
@@ -10,5 +10,4 @@
section="Applications/Science/Mathematics"\
icon="/usr/share/scilab/icons/scilab.xpm" \
title="Scilab"\
- command="/usr/bin/scilab -nw"
-
+ command="/usr/bin/scilab-adv-cli"
More information about the debian-science-commits
mailing list