[Pkg-octave-commit] rev 838 - in trunk/packages/octave/debian: . in patches

[Thomas Weber]

Author: thomas-guest
Date: 2007-02-07 21:47:27 +0100 (Wed, 07 Feb 2007)
New Revision: 838

Added:
   trunk/packages/octave/debian/patches/50_correct_test.dpatch
Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/in/octave2.9-00list
Log:
Fix for #410070


Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2007-02-04 18:09:24 UTC (rev 837)
+++ trunk/packages/octave/debian/changelog	2007-02-07 20:47:27 UTC (rev 838)
@@ -7,6 +7,10 @@
     avoid failures in print() when file extensions needing call to convert
     are specified by the user (closes: #408992)
 
+  [ Thomas Weber ]
+  * debian/patches/50_correct_test.dpatch: Use first file in loadpath for
+    tests (closes: #410070)
+
  --
 
 octave2.9 (2.9.9-7) unstable; urgency=low

Modified: trunk/packages/octave/debian/in/octave2.9-00list
===================================================================
--- trunk/packages/octave/debian/in/octave2.9-00list	2007-02-04 18:09:24 UTC (rev 837)
+++ trunk/packages/octave/debian/in/octave2.9-00list	2007-02-07 20:47:27 UTC (rev 838)
@@ -8,3 +8,4 @@
 50_invalid_indexes
 50_plot-doc
 50_print-imagemagick-extensions
+50_correct_test

Added: trunk/packages/octave/debian/patches/50_correct_test.dpatch
===================================================================
--- trunk/packages/octave/debian/patches/50_correct_test.dpatch	2007-02-04 18:09:24 UTC (rev 837)
+++ trunk/packages/octave/debian/patches/50_correct_test.dpatch	2007-02-07 20:47:27 UTC (rev 838)
@@ -0,0 +1,47 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_correct_test.dpatch by Thomas Weber <thomas.weber.mail at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Take new test.m from upstream CVS; Fix for #410070
+
+ at DPATCH@
+diff -urNad octave2.9-2.9.9~/scripts/testfun/test.m octave2.9-2.9.9/scripts/testfun/test.m
+--- octave2.9-2.9.9~/scripts/testfun/test.m	2006-07-27 19:16:14.000000000 +0200
++++ octave2.9-2.9.9/scripts/testfun/test.m	2007-02-07 15:39:19.000000000 +0100
+@@ -146,12 +146,16 @@
+   endif
+ 
+   ## locate the file to test
+-  __file = file_in_loadpath (__name);
+-  if (isempty (__file)) 
+-    __file = file_in_loadpath ([__name, ".m"]);
++  __file = file_in_loadpath (__name, "all");
++  if (isempty (__file))
++    __file = file_in_loadpath ([__name, ".m"], "all");
+   endif
+   if (isempty (__file))
+-    __file = file_in_loadpath ([__name, ".cc"]);
++    __file = file_in_loadpath ([__name, ".cc"], "all");
++  endif
++  if (iscell (__file))
++    ## If repeats, return first in path.
++    __file = __file{1};
+   endif
+   if (isempty (__file))
+     if (__grabdemo)
+@@ -479,12 +483,12 @@
+   pos = [];
+ 
+   ## Find the end of the name
+-  right = min(find(def=='('));
++  right = find(def=='(', 1);
+   if isempty(right), return; endif
+-  right = max(find(def(1:right-1) != ' '));
++  right = find(def(1:right-1) != ' ', 1, "last");
+ 
+   ## Find the beginning of the name
+-  left = max([find(def(1:right)==' '),find(def(1:right)=='=')]);
++  left = max([find(def(1:right)==' ', 1, "last"),find(def(1:right)=='=', 1, "last")]);
+   if isempty(left), return; endif
+   left++;
+ 


Property changes on: trunk/packages/octave/debian/patches/50_correct_test.dpatch
___________________________________________________________________
Name: svn:executable
   + *