[Pkg-octave-devel] Please unblock octave2.9_2.9.9-8
Rafael Laboissiere
rafael at debian.org
Thu Feb 8 02:36:50 CET 2007
In the behalf of the Debian Octave Group, I have just uploaded the octave2.9
packages version 2.9.9-8 to unstable. This version fixes Bug#410070, which
has severity level "important", as this makes developing unit tests for
Octave itself in a local directory difficult. The bug was fixed via a
dpatch (50_correct_test.dpatch), which was taken from the CVS repository
upstream. This version also fixes Bug#408992, through a dpatch
(50_print-imagemagick-extensions.dpatch) blessed by the upstream author.
The current version of octave2.9 in testing is 2.9.9-6. Version 2.9.9-7 was
released to unstable seven weeks ago. It fixed Bug#399190 (changed the
wording in debian/control) and Bug#398935 (changed documentation of the
plot.m script, dpatch: 50_plot-doc.dpatch).
The file containing the diffs between 2.9.9-6 and 2.9.9-8 is attached below.
Please, consider hinting octave2.9_2.9.9-8 to enter testing.
--
Rafael
-------------- next part --------------
Index: debian/in/control
===================================================================
--- debian/in/control (.../2.9.9-6) (revision 840)
+++ debian/in/control (.../2.9.9-8) (revision 840)
@@ -90,8 +90,8 @@
user-supplied code with GNU Octave. If you only write interpreted .m files,
you do not need this package.
.
- The package is "Architecture: any" specific as it contains architecture-
- specific compiler switches in the mkoctfile script.
+ The package is architecture-specific as it contains machine-dependent
+ compiler switches in the mkoctfile script.
.
Homepage: http://www.octave.org/
Index: debian/in/octave2.9-00list
===================================================================
--- debian/in/octave2.9-00list (.../2.9.9-6) (revision 840)
+++ debian/in/octave2.9-00list (.../2.9.9-8) (revision 840)
@@ -4,5 +4,8 @@
50_fix_hold_state.dpatch
50_rename-octave-tags
50_empty-lhs-sparse
-50_sparse_constructors.dpatch
+50_sparse_constructors
50_invalid_indexes
+50_plot-doc
+50_print-imagemagick-extensions
+50_correct_test
Index: debian/changelog
===================================================================
--- debian/changelog (.../2.9.9-6) (revision 840)
+++ debian/changelog (.../2.9.9-8) (revision 840)
@@ -1,3 +1,27 @@
+octave2.9 (2.9.9-8) unstable; urgency=low
+
+ [ Rafael Laboissiere ]
+ * debian/patches/50_print-imagemagick-extensions.dpatch: Added patch to
+ 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)
+
+ -- Rafael Laboissiere <rafael at debian.org> Thu, 8 Feb 2007 00:44:16 +0100
+
+octave2.9 (2.9.9-7) unstable; urgency=low
+
+ * debian/in/control: Changed wording of octave*-headers description.
+ Thanks to Reuben Thomas for the suggestion (closes: #399190).
+ * debian/patches/50_plot-doc.dpatch:Fixes a long-standing documentation
+ bug in Octave, regarding the plot function. Thanks to Francesco
+ Potort?? for the patch, which has been also applied to the 2.9 branch
+ upstream (closes: #398935).
+
+ -- Rafael Laboissiere <rafael at debian.org> Fri, 22 Dec 2006 11:54:57 +0100
+
octave2.9 (2.9.9-6) unstable; urgency=low
[ Thomas Weber ]
Index: debian/patches/50_plot-doc.dpatch
===================================================================
--- debian/patches/50_plot-doc.dpatch (.../2.9.9-6) (revision 0)
+++ debian/patches/50_plot-doc.dpatch (.../2.9.9-8) (revision 840)
@@ -0,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_plot-doc.dpatch by <rafael at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: New patch generated from octave2.9 2.9.9-7 diff.gz
+
+ at DPATCH@
+
+--- octave2.9-2.9.9.orig/scripts/plot/plot.m
++++ octave2.9-2.9.9/scripts/plot/plot.m
+@@ -52,13 +52,13 @@
+ ## the elements, starting with 1.
+ ##
+ ## @item
+-## If the first argument is a vector and the second is a matrix, the
+-## the vector is plotted versus the columns (or rows) of the matrix.
++## If the @var{x} is a vector and @var{y} is a matrix, the
++## the columns (or rows) of @var{y} are plotted versus @var{x}.
+ ## (using whichever combination matches, with columns tried first.)
+ ##
+ ## @item
+-## If the first argument is a matrix and the second is a vector, the
+-## the columns (or rows) of the matrix are plotted versus the vector.
++## If the @var{x} is a matrix and @var{y} is a vector,
++## @var{y} is plotted versus the columns (or rows) of @var{x}.
+ ## (using whichever combination matches, with columns tried first.)
+ ##
+ ## @item
+@@ -107,9 +107,9 @@
+ ## valid in combination with the @code{@@} or @code{-@@} specifiers.
+ ##
+ ## @item @var{c}
+-## If @var{c} is one of @code{"k"}, @code{"r"}, @code{"g"}, @code{"b"},
+-## @code{"m"}, @code{"c"}, or @code{"w"}, it is interpreted as the plot
+-## color (black, red, green, blue, magenta, cyan, or white).
++## If @var{c} is one of @code{"k"} (black), @code{"r"} (red), @code{"g"}
++## (green), @code{"b"} (blue), @code{"m"} (magenta), @code{"c"} (cyan),
++## or @code{"w"} (white), it is interpreted as the line plot color.
+ ##
+ ## @item ";title;"
+ ## Here @code{"title"} is the label for the key.
Property changes on: debian/patches/50_plot-doc.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Index: debian/patches/50_print-imagemagick-extensions.dpatch
===================================================================
--- debian/patches/50_print-imagemagick-extensions.dpatch (.../2.9.9-6) (revision 0)
+++ debian/patches/50_print-imagemagick-extensions.dpatch (.../2.9.9-8) (revision 840)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_print-imagemagick-extensions.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Call to cellidx will not fail when unknown file extensions imply
+## DP: call to the convert command
+
+ at DPATCH@
+
+--- octave2.9-2.9.9.orig/scripts/plot/print.m
++++ octave2.9-2.9.9/scripts/plot/print.m
+@@ -203,7 +203,7 @@
+ dev_list = {"aifm" "corel" "fig" "png" "pbm" "dxf" "mf" "hpgl", ...
+ "ps" "ps2" "psc" "psc2" "eps" "eps2" "epsc" "epsc2" "emf"};
+ convertname = "";
+- idx = cellidx (dev_list, dev);
++ [idx, errmsg] = cellidx (dev_list, dev);
+ if (! idx)
+ if (! isempty (devopt))
+ convertname = strcat (devopt, ":", name);
Property changes on: debian/patches/50_print-imagemagick-extensions.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Index: debian/patches/50_correct_test.dpatch
===================================================================
--- debian/patches/50_correct_test.dpatch (.../2.9.9-6) (revision 0)
+++ debian/patches/50_correct_test.dpatch (.../2.9.9-8) (revision 840)
@@ -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: debian/patches/50_correct_test.dpatch
___________________________________________________________________
Name: svn:executable
+ *
More information about the Pkg-octave-devel
mailing list