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

Rafael Laboissiere rafael at alioth.debian.org
Thu Feb 22 19:37:48 CET 2007


Author: rafael
Date: 2007-02-22 19:37:47 +0100 (Thu, 22 Feb 2007)
New Revision: 850

Added:
   branches/etch/packages/octave2.9/debian/patches/50_plot-doc.dpatch
   branches/etch/packages/octave2.9/debian/patches/50_print-imagemagick-extensions.dpatch
Modified:
   branches/etch/packages/octave2.9/debian/changelog
   branches/etch/packages/octave2.9/debian/in/control
   branches/etch/packages/octave2.9/debian/in/octave2.9-00list
Log:
Preparation for release octave2.9.9-8etch1


Modified: branches/etch/packages/octave2.9/debian/changelog
===================================================================
--- branches/etch/packages/octave2.9/debian/changelog	2007-02-22 10:20:32 UTC (rev 849)
+++ branches/etch/packages/octave2.9/debian/changelog	2007-02-22 18:37:47 UTC (rev 850)
@@ -1,24 +1,42 @@
-octave2.9 (2.9.9-6etch1) unstable; urgency=low
+octave2.9 (2.9.9-8etch1) unstable; urgency=low
 
   NOT YET RELEASED!
 
   [ Rafael Laboissiere ]
-  * This is a release for the testing (etch) distribution.  It is
+  * This release is intended 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:
+    necessary for fixing Bug#410463.  The fix for this bug revealed a
+    nasty bug in Octave related to the parsing of inline functions.  File
+    debian/patches/50_parse-inline-brackets.dpatch fixes it (closes:
+    #411863). This patch was proposed by the upstream author, see
+    http://www.cae.wisc.edu/pipermail/bug-octave/2006-October/000903.html
 
-    - 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-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 ]

Modified: branches/etch/packages/octave2.9/debian/in/control
===================================================================
--- branches/etch/packages/octave2.9/debian/in/control	2007-02-22 10:20:32 UTC (rev 849)
+++ branches/etch/packages/octave2.9/debian/in/control	2007-02-22 18:37:47 UTC (rev 850)
@@ -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/
 

Modified: branches/etch/packages/octave2.9/debian/in/octave2.9-00list
===================================================================
--- branches/etch/packages/octave2.9/debian/in/octave2.9-00list	2007-02-22 10:20:32 UTC (rev 849)
+++ branches/etch/packages/octave2.9/debian/in/octave2.9-00list	2007-02-22 18:37:47 UTC (rev 850)
@@ -4,7 +4,9 @@
 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
 50_parse-inline-brackets

Added: branches/etch/packages/octave2.9/debian/patches/50_plot-doc.dpatch
===================================================================
--- branches/etch/packages/octave2.9/debian/patches/50_plot-doc.dpatch	2007-02-22 10:20:32 UTC (rev 849)
+++ branches/etch/packages/octave2.9/debian/patches/50_plot-doc.dpatch	2007-02-22 18:37:47 UTC (rev 850)
@@ -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.

Added: branches/etch/packages/octave2.9/debian/patches/50_print-imagemagick-extensions.dpatch
===================================================================
--- branches/etch/packages/octave2.9/debian/patches/50_print-imagemagick-extensions.dpatch	2007-02-22 10:20:32 UTC (rev 849)
+++ branches/etch/packages/octave2.9/debian/patches/50_print-imagemagick-extensions.dpatch	2007-02-22 18:37:47 UTC (rev 850)
@@ -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);




More information about the Pkg-octave-commit mailing list