[Pkg-octave-commit] rev 849 - in branches/etch/packages/octave2.9/debian: . in patches

[Rafael Laboissiere]

Author: rafael
Date: 2007-02-22 11:20:32 +0100 (Thu, 22 Feb 2007)
New Revision: 849

Added:
   branches/etch/packages/octave2.9/debian/patches/50_correct_test.dpatch
   branches/etch/packages/octave2.9/debian/patches/50_parse-inline-brackets.dpatch
Modified:
   branches/etch/packages/octave2.9/debian/changelog
   branches/etch/packages/octave2.9/debian/in/octave2.9-00list
Log:
Prepartaion for release 2.9.9-6etch1 of octave2.9


Modified: branches/etch/packages/octave2.9/debian/changelog
===================================================================
--- branches/etch/packages/octave2.9/debian/changelog	2007-02-22 09:33:27 UTC (rev 848)
+++ branches/etch/packages/octave2.9/debian/changelog	2007-02-22 10:20:32 UTC (rev 849)
@@ -1,3 +1,24 @@
+octave2.9 (2.9.9-6etch1) unstable; urgency=low
+
+  NOT YET RELEASED!
+
+  [ Rafael Laboissiere ]
+  * This is a release for the testing (etch) distribution.  It is
+    coordinated with the release 2006.07.09+dfsg1-8 of octave2.9-forge,
+    necessary for fixing Bug#410463.  In order to have this fixed, two
+    changes in the octave2.9 upstream sources are needed:
+
+    - debian/patches/50_correct_test.dpatch: Use first file in loadpath
+      for tests.  This is taken from the upstream CVS repository, see
+      http://www.cae.wisc.edu/pipermail/bug-octave/2007-January/001464.html
+
+    - debian/patches/50_parse-inline-brackets.dpatch: Fix a parsing
+      problem in function handles and inlines were brackets are present.
+      This patch has been applied upstream in CVS  (closes: #411863). See
+      http://www.cae.wisc.edu/pipermail/bug-octave/2006-October/000903.html
+
+ --
+
 octave2.9 (2.9.9-6) unstable; urgency=low
 
   [ Thomas Weber ]

Modified: branches/etch/packages/octave2.9/debian/in/octave2.9-00list
===================================================================
--- branches/etch/packages/octave2.9/debian/in/octave2.9-00list	2007-02-22 09:33:27 UTC (rev 848)
+++ branches/etch/packages/octave2.9/debian/in/octave2.9-00list	2007-02-22 10:20:32 UTC (rev 849)
@@ -6,3 +6,5 @@
 50_empty-lhs-sparse
 50_sparse_constructors.dpatch
 50_invalid_indexes
+50_correct_test
+50_parse-inline-brackets

Added: branches/etch/packages/octave2.9/debian/patches/50_correct_test.dpatch
===================================================================
--- branches/etch/packages/octave2.9/debian/patches/50_correct_test.dpatch	2007-02-22 09:33:27 UTC (rev 848)
+++ branches/etch/packages/octave2.9/debian/patches/50_correct_test.dpatch	2007-02-22 10:20:32 UTC (rev 849)
@@ -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: branches/etch/packages/octave2.9/debian/patches/50_correct_test.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: branches/etch/packages/octave2.9/debian/patches/50_parse-inline-brackets.dpatch
===================================================================
--- branches/etch/packages/octave2.9/debian/patches/50_parse-inline-brackets.dpatch	2007-02-22 09:33:27 UTC (rev 848)
+++ branches/etch/packages/octave2.9/debian/patches/50_parse-inline-brackets.dpatch	2007-02-22 10:20:32 UTC (rev 849)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_parse-inline-brackets.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Fix a parsing problem in function handles and inlines were brackets
+## DP: are present.  This patch has been applied upstream in CVS. See
+## DP: https://www.cae.wisc.edu/pipermail/bug-octave/2006-October/000903.html 
+
+ at DPATCH@
+
+--- octave2.9-2.9.9.orig/src/pt-cell.cc
++++ octave2.9-2.9.9/src/pt-cell.cc
+@@ -110,7 +110,7 @@
+     {
+       tree_argument_list *elt = *p;
+ 
+-      append (elt ? elt->dup (sym_tab) : 0);
++      new_cell->append (elt ? elt->dup (sym_tab) : 0);
+     }
+ 
+   new_cell->copy_base (*this);
+--- octave2.9-2.9.9.orig/src/pt-mat.cc
++++ octave2.9-2.9.9/src/pt-mat.cc
+@@ -942,7 +942,7 @@
+     {
+       tree_argument_list *elt = *p;
+ 
+-      append (elt ? elt->dup (sym_tab) : 0);
++      new_matrix->append (elt ? elt->dup (sym_tab) : 0);
+     }
+ 
+   new_matrix->copy_base (*this);


Property changes on: branches/etch/packages/octave2.9/debian/patches/50_parse-inline-brackets.dpatch
___________________________________________________________________
Name: svn:executable
   + *