r35286 - in /packages/scilab/trunk/debian: control patches/addchapter.diff patches/adddemo.diff patches/series rules scilab-data.install

Tue Oct 28 16:18:22 UTC 2008

Author: sylvestre-guest
Date: Tue Oct 28 16:18:22 2008
New Revision: 35286

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35286
Log:
Dispatch files into the right directories + patch some scilab code to remove warnings when Scilab help/demos are not installed

Added:
    packages/scilab/trunk/debian/patches/addchapter.diff
    packages/scilab/trunk/debian/patches/adddemo.diff
Modified:
    packages/scilab/trunk/debian/control
    packages/scilab/trunk/debian/patches/series
    packages/scilab/trunk/debian/rules
    packages/scilab/trunk/debian/scilab-data.install

Modified: packages/scilab/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/control?rev=35286&op=diff
==============================================================================

--- packages/scilab/trunk/debian/control (original)
+++ packages/scilab/trunk/debian/control Tue Oct 28 16:18:22 2008
@@ -63,6 +63,19 @@
  .
  This package contains the architecture specific binary files.
 
+Package: libscilab-java
+Architecture: any
+Depends: ${shlibs:Depends}, scilab
+Replaces: scilab (<< 3.0-5)
+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.
+
 Package: scilab-doc
 Section: doc
 Architecture: all

Added: packages/scilab/trunk/debian/patches/addchapter.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/addchapter.diff?rev=35286&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/addchapter.diff (added)
+++ packages/scilab/trunk/debian/patches/addchapter.diff Tue Oct 28 16:18:22 2008
@@ -1,0 +1,14 @@
+--- scilab-5.0.2.orig/modules/helptools/macros/add_module_help_chapter.sci	2008-10-28 16:11:22.000000000 +0100
++++ scilab-5.0.2/modules/helptools/macros/add_module_help_chapter.sci	2008-10-28 16:42:12.000000000 +0100
+@@ -12,9 +12,7 @@
+ 	if ( fileinfo(path_addchapter) == [] ) then
+ 		path_addchapter = SCI+"/modules/"+modulename+"/help/"+getdefaultlanguage()+"/addchapter.sce";
+ 	end
+-	//try
++	if ( fileinfo(path_addchapter) <> [] ) then
+ 		exec(path_addchapter);
+-	//catch
+-	//    warning(gettext("Incorrect module path ")+path_addchapter);
+-	//end
++	end
+ endfunction

Added: packages/scilab/trunk/debian/patches/adddemo.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/adddemo.diff?rev=35286&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/adddemo.diff (added)
+++ packages/scilab/trunk/debian/patches/adddemo.diff Tue Oct 28 16:18:22 2008
@@ -1,0 +1,18 @@
+--- scilab-5.0.2.orig/modules/core/macros/add_demo.sci	2008-10-16 13:55:35.000000000 +0200
++++ scilab-5.0.2/modules/core/macros/add_demo.sci	2008-10-28 17:02:25.000000000 +0100
+@@ -10,7 +10,7 @@
+ function add_demo(demotitle,path)
+   global demolist
+   path=pathconvert(path,%f,%t)
+-  if fileinfo(path)==[] then  error(msprintf(gettext("%s: The file %s does not exist.\n"),"add_demo",path)),end
++  if fileinfo(path) <> [] then 
+   if isdir(path) then 
+     error(msprintf(gettext("%s: Wrong input argument #%d: Path to a scilab script file expected.\n"),"add_demo",2));
+   end
+@@ -21,5 +21,6 @@
+     k1=find(demolist(k,2)==path)
+     if k1==[] then demolist=[demolist;demotitle+' ('+string(size(k,'*'))+')',path],end
+   end
++  end
+   clear demolist
+ endfunction

Modified: packages/scilab/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/series?rev=35286&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/series (original)
+++ packages/scilab/trunk/debian/patches/series Tue Oct 28 16:18:22 2008
@@ -1,3 +1,5 @@
 librarypath.diff
 docbook.diff
 jeuclid.diff
+addchapter.diff
+adddemo.diff

Modified: packages/scilab/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/rules?rev=35286&op=diff
==============================================================================
--- packages/scilab/trunk/debian/rules (original)
+++ packages/scilab/trunk/debian/rules Tue Oct 28 16:18:22 2008
@@ -81,7 +81,12 @@
 	mv $(CURDIR)/debian/tmp/usr/share/scilab/modules/helptools/jar/scilab_fr_FR_help.jar $(CURDIR)/debian/scilab-doc-fr/usr/share/scilab/modules/helptools/jar/
 
 
-binary-post-install/scilab-data::
+# Move the javasci lib
+	mkdir -p $(CURDIR)/debian/libscilab-java/usr/share/java/
+	mv debian/tmp/usr/share/scilab/modules/javasci/jar/javasci.jar $(CURDIR)/debian/libscilab-java/usr/share/java/
+
+
+#binary-post-install/scilab-data::
 # Remove them from data
 # They are included in the scilab-doc
 #	rm -f $(CURDIR)/debian/scilab-data/usr/share/scilab/modules/scicos/help/fr_FR/scicos_help.jar $(CURDIR)/debian/scilab-data/usr/share/scilab/modules/scicos/help/en_US/scicos_help.jar

Modified: packages/scilab/trunk/debian/scilab-data.install
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/scilab-data.install?rev=35286&op=diff
==============================================================================
--- packages/scilab/trunk/debian/scilab-data.install (original)
+++ packages/scilab/trunk/debian/scilab-data.install Tue Oct 28 16:18:22 2008
@@ -1,1 +1,3 @@
 debian/tmp/usr/share/scilab
+debian/tmp/usr/share/locale
+


