r46216 - /packages/scilab/branches/5.5/debian/patches/

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Tue Aug 20 08:54:22 2013
New Revision: 46216

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46216
Log:
Remove deprecated patches

Removed:
    packages/scilab/branches/5.5/debian/patches/0001-Port-to-matio-1.5.0.patch
    packages/scilab/branches/5.5/debian/patches/0001-Use-the-arpack-provided-by-the-system-and-not-the-on.patch
    packages/scilab/branches/5.5/debian/patches/Fix_a_typo_in_the_french_translation.diff
    packages/scilab/branches/5.5/debian/patches/modelicac-not-available.diff
    packages/scilab/branches/5.5/debian/patches/remove-deprecated-file.diff
Modified:
    packages/scilab/branches/5.5/debian/patches/adddemo.diff
    packages/scilab/branches/5.5/debian/patches/librarypath.diff
    packages/scilab/branches/5.5/debian/patches/series

Modified: packages/scilab/branches/5.5/debian/patches/adddemo.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/adddemo.diff?rev=46216&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/adddemo.diff	(original)
+++ packages/scilab/branches/5.5/debian/patches/adddemo.diff	Tue Aug 20 08:54:22 2013
@@ -1,13 +1,13 @@
-Index: scilab-5.4.0-alpha-20122105-824511b/modules/demo_tools/macros/add_demo.sci
+Index: scilab-5.5.0/modules/demo_tools/macros/add_demo.sci
 ===================================================================
---- scilab-5.4.0-alpha-20122105-824511b.orig/modules/demo_tools/macros/add_demo.sci	2012-05-21 14:59:42.000000000 +0200
-+++ scilab-5.4.0-alpha-20122105-824511b/modules/demo_tools/macros/add_demo.sci	2012-05-21 14:59:50.000000000 +0200
+--- scilab-5.5.0.orig/modules/demo_tools/macros/add_demo.sci	2013-08-20 10:52:20.000000000 +0200
++++ scilab-5.5.0/modules/demo_tools/macros/add_demo.sci	2013-08-20 10:52:46.000000000 +0200
 @@ -35,7 +35,7 @@
-   path = pathconvert(path, %f, %t);
+     path = pathconvert(path, %f, %t);
  
-   if ~isfile(path) then
--    error(msprintf(gettext("%s: The file %s does not exist.\n"), "add_demo", path));
-+    error(msprintf(gettext("Demos are not available. Please install the package scilab-doc\n")));
-   end
+     if ~isfile(path) then
+-        error(msprintf(gettext("%s: The file %s does not exist.\n"), "add_demo", path));
++        error(msprintf(gettext("Demos are not available. Please install the package scilab-doc\n")));
+     end
  
-   if isdir(path) then
+     if isdir(path) then

Modified: packages/scilab/branches/5.5/debian/patches/librarypath.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/librarypath.diff?rev=46216&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/librarypath.diff	(original)
+++ packages/scilab/branches/5.5/debian/patches/librarypath.diff	Tue Aug 20 08:54:22 2013
@@ -1,17 +1,17 @@
-Index: scilab-5.4.0-alpha-20122105-824511b/bin/scilab
+Index: scilab-5.5.0/bin/scilab
 ===================================================================
---- scilab-5.4.0-alpha-20122105-824511b.orig/bin/scilab	2012-05-21 14:59:42.000000000 +0200
-+++ scilab-5.4.0-alpha-20122105-824511b/bin/scilab	2012-05-21 14:59:51.000000000 +0200
-@@ -739,7 +739,7 @@
- 
- # . is used by the dynamic link. The build lib are copied into the PWD
- SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/:.
+--- scilab-5.5.0.orig/bin/scilab	2013-08-20 10:52:58.000000000 +0200
++++ scilab-5.5.0/bin/scilab	2013-08-20 10:53:55.000000000 +0200
+@@ -754,7 +754,7 @@
+ if test -d $SCI/lib/thirdparty; then
+     SCILIB=$SCI/lib/thirdparty:$SCILIB;
+ fi
 -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
-@@ -783,6 +783,7 @@
+@@ -798,6 +798,7 @@
      *)
  esac
  
@@ -19,7 +19,7 @@
  
  if test $SCIVERBOSE -ne 0; then
      echo "LD_LIBRARY_PATH : $LD_LIBRARY_PATH"
-@@ -1012,6 +1013,7 @@
+@@ -1069,6 +1070,7 @@
          esac
      done
  

Modified: packages/scilab/branches/5.5/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/patches/series?rev=46216&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/patches/series	(original)
+++ packages/scilab/branches/5.5/debian/patches/series	Tue Aug 20 08:54:22 2013
@@ -1,5 +1,4 @@
 adddemo.diff
 librarypath.diff
 missingaddchapter.diff
-0001-Port-to-matio-1.5.0.patch
-remove-deprecated-file.diff
+