r44466 - /packages/scilab/branches/5.4/debian/patches/librarypath.diff

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Sat Feb 11 07:37:12 2012
New Revision: 44466

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44466
Log:
refresh of the patch

Modified:
    packages/scilab/branches/5.4/debian/patches/librarypath.diff

Modified: packages/scilab/branches/5.4/debian/patches/librarypath.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/patches/librarypath.diff?rev=44466&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/patches/librarypath.diff (original)
+++ packages/scilab/branches/5.4/debian/patches/librarypath.diff Sat Feb 11 07:37:12 2012
@@ -1,29 +1,29 @@
-diff -ur scilab-5.3.2.orig/bin//scilab scilab-5.3.2/bin//scilab
---- scilab-5.3.2.orig/bin//scilab	2011-05-11 17:42:11.000000000 +0200
-+++ scilab-5.3.2/bin//scilab	2011-05-12 14:21:44.000000000 +0200
-@@ -667,7 +667,7 @@
- }
+Index: scilab-5.2.2/bin/scilab
+===================================================================
+--- scilab-5.2.2.orig/bin/scilab	2012-02-11 08:33:03.883445370 +0100
++++ scilab-5.2.2/bin/scilab	2012-02-11 08:35:11.891442515 +0100
+@@ -742,7 +742,7 @@
  
- SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/
+ # . is used by the dynamic link. The build lib are copied into the PWD
+ 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
-@@ -698,6 +698,7 @@
+@@ -777,6 +777,7 @@
      *)
  esac
  
-+LD_LIBRARY_PATH=/usr/lib/scilab/:/usr/lib64/scilab/:$LD_LIBRARY_PATH
++LD_LIBRARY_PATH=/usr/lib/scilab/:/usr/lib64/scilab/:.${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
  
  if test $SCIVERBOSE -ne 0; then
      echo "LD_LIBRARY_PATH : $LD_LIBRARY_PATH"
-@@ -904,6 +905,7 @@
+@@ -1001,6 +1002,7 @@
          esac
      done
  
-+LD_LIBRARY_PATH=/usr/lib/scilab/:/usr/lib64/scilab/:$LD_LIBRARY_PATH
++LD_LIBRARY_PATH=/usr/lib/scilab/:/usr/lib64/scilab/:.${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
  
  # If the argument -a is not provided (extraarg) and we found unknown args
  # fail and provide help
-