r35646 - in /packages/scilab/trunk/debian: changelog patches/64bitsdetection.diff patches/addchapter.diff patches/adddemo.diff patches/displayStack.diff patches/filesWithSpace.diff patches/javaHeadLess.diff patches/xmlCleanupParser.diff

[c_korn-guest at users.alioth.debian.org]

Author: c_korn-guest
Date: Tue Apr 14 17:20:55 2009
New Revision: 35646

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35646
Log:
New upstream version.

Remove obsolete patches and adjust others.

Removed:
    packages/scilab/trunk/debian/patches/64bitsdetection.diff
    packages/scilab/trunk/debian/patches/displayStack.diff
    packages/scilab/trunk/debian/patches/filesWithSpace.diff
    packages/scilab/trunk/debian/patches/javaHeadLess.diff
    packages/scilab/trunk/debian/patches/xmlCleanupParser.diff
Modified:
    packages/scilab/trunk/debian/changelog
    packages/scilab/trunk/debian/patches/addchapter.diff
    packages/scilab/trunk/debian/patches/adddemo.diff

Modified: packages/scilab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/changelog?rev=35646&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Tue Apr 14 17:20:55 2009
@@ -1,3 +1,9 @@
+scilab (5.1.1-1) experimental; urgency=low
+
+  * New upstream version.
+
+ -- Christoph Korn <c_korn at gmx.de>  Tue, 14 Apr 2009 17:46:43 +0200
+
 scilab (5.1-2) experimental; urgency=low
 
   [ Sylvestre Ledru ]

Modified: packages/scilab/trunk/debian/patches/addchapter.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/addchapter.diff?rev=35646&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/addchapter.diff (original)
+++ packages/scilab/trunk/debian/patches/addchapter.diff Tue Apr 14 17:20:55 2009
@@ -1,9 +1,10 @@
---- 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
+diff -Nur scilab-5.1.1.orig/modules/helptools/macros/add_module_help_chapter.sci scilab-5.1.1/modules/helptools/macros/add_module_help_chapter.sci
+--- scilab-5.1.1.orig/modules/helptools/macros/add_module_help_chapter.sci	2009-04-14 09:30:56.000000000 +0200
++++ scilab-5.1.1/modules/helptools/macros/add_module_help_chapter.sci	2009-04-14 18:07:23.000000000 +0200
+@@ -19,10 +19,8 @@
  		path_addchapter = SCI+"/modules/"+modulename+"/help/"+getdefaultlanguage()+"/addchapter.sce";
  	end
+ 	
 -	//try
 +	if ( fileinfo(path_addchapter) <> [] ) then
  		exec(path_addchapter);
@@ -11,4 +12,5 @@
 -	//    warning(gettext("Incorrect module path ")+path_addchapter);
 -	//end
 +	end
- endfunction
+ 	
+ endfunction

Modified: packages/scilab/trunk/debian/patches/adddemo.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/adddemo.diff?rev=35646&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/adddemo.diff (original)
+++ packages/scilab/trunk/debian/patches/adddemo.diff Tue Apr 14 17:20:55 2009
@@ -1,18 +1,23 @@
---- 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 
+diff -Nur scilab-5.1.1.orig/modules/core/macros/add_demo.sci scilab-5.1.1/modules/core/macros/add_demo.sci
+--- scilab-5.1.1.orig/modules/core/macros/add_demo.sci	2009-04-14 09:30:44.000000000 +0200
++++ scilab-5.1.1/modules/core/macros/add_demo.sci	2009-04-14 17:54:41.000000000 +0200
+@@ -17,9 +17,7 @@
+   
+   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));
+@@ -33,7 +31,7 @@
+     k1=find(demolist(k,2)==path)
+     if k1==[] then demolist=[demolist;demotitle+" ("+string(size(k,"*"))+")",path],end
    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
+   
+ endfunction