r44260 - in /packages/scilab/trunk/debian: changelog patches/adddemo.diff rules

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Wed Dec 28 15:06:01 2011
New Revision: 44260

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44260
Log:
scilab (5.3.3-5) unstable; urgency=low

  * Update the error message of the demo when scilab-doc is not installed
  * Fix a build issues relative to LD_LIBRARY_PATH


Modified:
    packages/scilab/trunk/debian/changelog
    packages/scilab/trunk/debian/patches/adddemo.diff
    packages/scilab/trunk/debian/rules

Modified: packages/scilab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/changelog?rev=44260&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Wed Dec 28 15:06:01 2011
@@ -1,3 +1,10 @@
+scilab (5.3.3-5) unstable; urgency=low
+
+  * Update the error message of the demo when scilab-doc is not installed
+  * Fix a build issues relative to LD_LIBRARY_PATH
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Wed, 28 Dec 2011 11:33:45 +0100
+
 scilab (5.3.3-4) unstable; urgency=low
 
   * Dependency fftw3-dev dropped (replaced by libfftw3-dev)

Modified: packages/scilab/trunk/debian/patches/adddemo.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/adddemo.diff?rev=44260&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/adddemo.diff (original)
+++ packages/scilab/trunk/debian/patches/adddemo.diff Wed Dec 28 15:06:01 2011
@@ -1,23 +1,13 @@
-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 @@
-   
+Index: scilab-5.3.3/modules/core/macros/add_demo.sci
+===================================================================
+--- scilab-5.3.3.orig/modules/core/macros/add_demo.sci	2011-07-20 10:15:44.000000000 +0200
++++ scilab-5.3.3/modules/core/macros/add_demo.sci	2011-12-28 11:37:08.843559856 +0100
+@@ -18,7 +18,7 @@
    path=pathconvert(path,%f,%t);
    
--  if ~isfile(path) then
+   if ~isfile(path) then
 -    error(msprintf(gettext("%s: The file %s does not exist.\n"),"add_demo",path));
--  end
-+  if ~isfile(path) then
++    error(msprintf(gettext("Demos are not available. Please install the package scilab-doc\n")));
+   end
    
    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
--  
-+  end
-   clear demolist
-   
- endfunction

Modified: packages/scilab/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/rules?rev=44260&op=diff
==============================================================================
--- packages/scilab/trunk/debian/rules (original)
+++ packages/scilab/trunk/debian/rules Wed Dec 28 15:06:01 2011
@@ -11,8 +11,6 @@
 			$(filter $(DEB_HOST_ARCH)=%, $(archdir_map))))
 
 JAVA_HOME            := /usr/lib/jvm/default-java
-
-LD_LIBRARY_PATH = $(JAVA_HOME)/jre/lib/$(archdir)/:/usr/lib/libfakeroot/:$(JAVA_HOME)/jre/lib/$(archdir)/server:$(JAVA_HOME)/jre/lib/$(archdir)/native_threads/:$(DEB_DESTDIR)/usr/lib/scilab/
 
 DEB_CONFIGURE_NORMAL_ARGS += --prefix=$(DEB_CONFIGURE_PREFIX) \
 	--with-pvm --with-fftw --enable-relocatable \
@@ -193,5 +191,5 @@
 
 pre-build:: 
 	sh debian/watcher.sh "$$PPID" "$(CURDIR)" "$(CURDIR)/build-stamp" 'scilab' &
-	sed -i -e "s|Clément DAVID|Clement DAVID|g" $$(find . -iname '*.java')
+	sed -i -e "s|Clément DAVID|Clement DAVID|g" $$(find $(CURDIR) -iname '*.java')