[Pkg-octave-commit] r931 - in octave/trunk/debian: . in patches
Thomas Weber
thomas-guest at alioth.debian.org
Wed May 23 21:22:26 UTC 2007
Author: thomas-guest
Date: 2007-05-23 21:22:25 +0000 (Wed, 23 May 2007)
New Revision: 931
Removed:
octave/trunk/debian/patches/50_doc-builtin-vars.dpatch
octave/trunk/debian/patches/50_dont_resize_empty_dimensions.dpatch
octave/trunk/debian/patches/50_examples-use-gnuclient.dpatch
octave/trunk/debian/patches/50_fft_with_empty_matrix.dpatch
octave/trunk/debian/patches/50_glpk-pre-ifdef-logic.dpatch
Modified:
octave/trunk/debian/changelog
octave/trunk/debian/in/control
octave/trunk/debian/in/octave2.9-00list
Log:
New upstream release 2.9.12
Drop applied patches
Build-dep on libcurl4-dev for the url* functions
Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog 2007-05-23 10:46:29 UTC (rev 930)
+++ octave/trunk/debian/changelog 2007-05-23 21:22:25 UTC (rev 931)
@@ -1,4 +1,4 @@
-octave2.9 (2.9.10-5) unstable; urgency=low
+octave2.9 (2.9.12-1) unstable; urgency=low
NOT YET RELEASED!
@@ -7,11 +7,27 @@
package twice in a row will succeed (closes: #424381)
[ Thomas Weber ]
- * debian/patches/50_fft_with_empty_matrix.dpatch:
- Sync fft.cc with upstream (closes: #423278)
+ * New upstream release
+ (2.9.11 had a problem when building, so we didn't package it)
+ * This release fixes the problem with handing empty matrices to fft.m
+ (closes: #423278)
+ * Dropped patches (applied upstream):
+ + 50_fft_with_empty_matrix.dpatch
+ + 50_doc-builtin-vars.dpatch
+ + 50_glpk-pre-ifdef-logic.dpatch
+ + 50_dont_resize_empty_dimensions.dpatch
+ + 50_examples-use-gnuclient.dpatch
+ + 50_syscalls-test-sleep.dpatch
+ The first of these patches was never applied to any Debian release; it was
+ meant to fix #423278 and is included in this upstream release.
- --
+ FIXME: I'm unsure about the last patch. There seems to be a change in the
+ order of sleep and fclear calls, but I don't know if this fixes the "make
+ check" hangs
+ * debian/in/control: Add build-dep on libcurl4-dev for the url* functions
+ -- Rafael Laboissiere <rafael at debian.org> Sun, 15 Apr 2007 23:13:13 +0200
+
octave2.9 (2.9.10-4) unstable; urgency=low
[ Rafael Laboissiere ]
Modified: octave/trunk/debian/in/control
===================================================================
--- octave/trunk/debian/in/control 2007-05-23 10:46:29 UTC (rev 930)
+++ octave/trunk/debian/in/control 2007-05-23 21:22:25 UTC (rev 931)
@@ -10,7 +10,7 @@
refblas3-dev | atlas3-base-dev, lapack3-dev | atlas3-base-dev,
gnuplot-nox, fftw3-dev, dejagnu, texi2html, less, dpatch,
slice[V_2_9:, libpcre3-dev, flex, libglpk-dev (>= 4.15),
- libufsparse-dev, gawk, gs-gpl:]
+ libufsparse-dev, gawk, gs-gpl, libcurl4-dev:]
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-octave/octave/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-octave/octave/
Modified: octave/trunk/debian/in/octave2.9-00list
===================================================================
--- octave/trunk/debian/in/octave2.9-00list 2007-05-23 10:46:29 UTC (rev 930)
+++ octave/trunk/debian/in/octave2.9-00list 2007-05-23 21:22:25 UTC (rev 931)
@@ -1,7 +1 @@
50_octave-bug-tempfile
-50_glpk-pre-ifdef-logic
-50_syscalls-test-sleep
-50_doc-builtin-vars
-50_examples-use-gnuclient
-50_dont_resize_empty_dimensions.dpatch
-50_fft_with_empty_matrix
Deleted: octave/trunk/debian/patches/50_doc-builtin-vars.dpatch
===================================================================
--- octave/trunk/debian/patches/50_doc-builtin-vars.dpatch 2007-05-23 10:46:29 UTC (rev 930)
+++ octave/trunk/debian/patches/50_doc-builtin-vars.dpatch 2007-05-23 21:22:25 UTC (rev 931)
@@ -1,273 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_doc-builtin-vars.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Fix documentation for obsolete built-in variables LOADPATH,
-## DP: INFO_FILE, and INFO_PROGRAM. Also, fix the octave-variables
-## DP: variable in octave-mod.el. This patch is taken from the upstream CVS.
-
- at DPATCH@
-
---- octave2.9-2.9.10.orig/ChangeLog
-+++ octave2.9-2.9.10/ChangeLog
-@@ -1,3 +1,8 @@
-+2007-03-29 Rafael Laboissiere <rafael at debian.org>
-+
-+ * emacs/octave-mod.el: Drop LOADPATH, INFO_FILE, and
-+ INFO_PROGRAM from octave-variables.
-+
- 2007-03-27 John W. Eaton <jwe at octave.org>
-
- * octMakefile.in (dist, conf-dist): Use ln, not $(LN_S).
---- octave2.9-2.9.10.orig/doc/ChangeLog
-+++ octave2.9-2.9.10/doc/ChangeLog
-@@ -1,3 +1,15 @@
-+2007-03-29 Rafael Laboissiere <rafael at debian.org>
-+
-+ * faq/Octave-FAQ.texi, interpreter/basics.txi,
-+ interpreter/emacs.txi, interpreter/func.tx, interpreter/var.txi:
-+ Make it clear that the old built-in LOADPATH is an internal
-+ variable, accessible through path ().
-+ Drop references to DEFAULT_LOADPATH.
-+ Chang references to the old built-in variables INFO_FILE and
-+ INFO_PROGRAM to the respective functions info_file and
-+ info_program.
-+ * refcard/refcard.tex: Drop LOADPATH from list of built-in variables.
-+
- 2007-03-27 John W. Eaton <jwe at octave.org>
-
- * Makefile.in, interpreter/Makefile.in, faq/Makefile.in,
---- octave2.9-2.9.10.orig/doc/faq/Octave-FAQ.texi
-+++ octave2.9-2.9.10/doc/faq/Octave-FAQ.texi
-@@ -623,11 +623,12 @@
- @item
- Octave takes a long time to find symbols.
-
--Octave is probably spending this time recursively searching directories
--for function files. Check the value of your LOADPATH. For those
-+Octave is probably spending this time recursively searching directories for
-+function files. Check the value of the internal variable LOADPATH,
-+accessible through the Octave function @code{path}. For those
- elements that end in @samp{//}, do any name a very large directory tree?
--Does it contain directories that have a mixture of files and
--directories? In order for the recursive directory searching code to
-+Does it contain directories that have a mixture of files and
-+directories? In order for the recursive directory searching code to
- work efficiently, directories that are to be searched recursively should
- have either function files only, or subdirectories only, but not a
- mixture of both. Check to make sure that Octave's standard set of
---- octave2.9-2.9.10.orig/doc/interpreter/basics.txi
-+++ octave2.9-2.9.10/doc/interpreter/basics.txi
-@@ -91,16 +91,16 @@
- Specify the name of the info file to use. The value of @var{filename}
- specified on the command line will override any value of
- @code{OCTAVE_INFO_FILE} found in the environment, but not any commands
--in the system or user startup files that set the built-in variable
-- at code{INFO_FILE}.
-+in the system or user startup files that use the the @code{info_file}
-+function.
-
- @item --info-program @var{program}
- @cindex @code{--info-program @var{program}}
- Specify the name of the info program to use. The value of @var{program}
- specified on the command line will override any value of
- @code{OCTAVE_INFO_PROGRAM} found in the environment, but not any
--commands in the system or user startup files that set the built-in
--variable @code{INFO_PROGRAM}.
-+commands in the system or user startup files that use the
-+ at code{info_program} function.
-
- @item --interactive
- @itemx -i
-@@ -141,7 +141,8 @@
- Specify the path to search for function files. The value of @var{path}
- specified on the command line will override any value of
- @code{OCTAVE_PATH} found in the environment, but not any commands in the
--system or user startup files that set the built-in variable @code{LOADPATH}.
-+system or user startup files that set the internal variable @code{LOADPATH}
-+through one of the path functions.
-
- @item --persist
- Go to interactive mode after @code{--eval} or reading from a file
-@@ -297,11 +298,11 @@
- comma and semicolons that are used as command separators. To get help
- for those, you must type @kbd{help comma} or @kbd{help semicolon}.
-
-- at DOCSTRING(INFO_FILE)
-+ at DOCSTRING(info_file)
-
-- at DOCSTRING(INFO_PROGRAM)
-+ at DOCSTRING(info_program)
-
-- at DOCSTRING(MAKEINFO_PROGRAM)
-+ at DOCSTRING(makeinfo_program)
-
- @DOCSTRING(suppress_verbose_help_message)
-
---- octave2.9-2.9.10.orig/doc/interpreter/emacs.txi
-+++ octave2.9-2.9.10/doc/interpreter/emacs.txi
-@@ -328,7 +328,7 @@
- @code{font-lock-reference-face}
- @item
- the builtin variables (such as @samp{warn_fortran_indexing}, @samp{NaN}
--or @samp{LOADPATH}) in @code{font-lock-variable-name-face}
-+or @samp{EDITOR}) in @code{font-lock-variable-name-face}
- @item
- and the function names in function declarations in
- @code{font-lock-function-name-face}.
-@@ -488,11 +488,11 @@
-
- You can use either `plain' Emacs Info or the function @code{octave-help}
- as your Octave info reader (for @samp{help -i}). In the former case,
--set the Octave variable @code{INFO_PROGRAM} to @code{"info-emacs-info"}.
-+use @code{info_program ("info-emacs-info")}.
- The latter is perhaps more attractive because it allows to look up keys
- in the indices of @emph{several} info files related to Octave (provided
- that the Emacs variable @code{octave-help-files} is set correctly). In
--this case, set @code{INFO_PROGRAM} to @code{"info-emacs-octave-help"}.
-+this case, use @code{info_program ("info-emacs-octave-help")}.
-
- If you use Octave from within Emacs, these settings are best done in the
- @file{~/.emacs-octave} startup file (or the file pointed to by the Emacs
---- octave2.9-2.9.10.orig/doc/interpreter/func.txi
-+++ octave2.9-2.9.10/doc/interpreter/func.txi
-@@ -398,7 +398,7 @@
- When Octave encounters an identifier that is undefined, it first looks
- for variables or functions that are already compiled and currently
- listed in its symbol table. If it fails to find a definition there, it
--searches the list of directories specified by the built-in variable
-+searches the list of directories specified by the internal variable
- @code{LOADPATH} for files ending in @file{.m} that have the same base
- name as the undefined identifier. at footnote{The @samp{.m} suffix was
- chosen for compatibility with @sc{Matlab}.} Once Octave finds a file
-@@ -437,9 +437,7 @@
-
- @c FIXME -- note about time stamps on files in NFS environments?
-
-- at DOCSTRING(DEFAULT_LOADPATH)
--
-- at DOCSTRING(LOADPATH)
-+ at DOCSTRING(path)
-
- @DOCSTRING(rehash)
-
-@@ -491,10 +489,11 @@
- @end example
-
- To have Octave read and compile these functions into an internal form,
--you need to make sure that the file is in Octave's @code{LOADPATH}, then
--simply type the base name of the file that contains the commands.
--(Octave uses the same rules to search for script files as it does to
--search for function files.)
-+you need to make sure that the file is in Octave's @code{LOADPATH}
-+(accessible through the @code{path} function), then simply type the
-+base name of the file that contains the commands. (Octave uses the
-+same rules to search for script files as it does to search for
-+function files.)
-
- If the first token in a file (ignoring comments) is @code{function},
- Octave will compile the function and try to execute it, printing a
-@@ -529,7 +528,7 @@
- following code will always print @samp{bar = 3} whether it is typed
- directly on the command line, read from a script file, or is part of a
- function body, even if there is a function or script file called
-- at file{bar.m} in Octave's @code{LOADPATH}.
-+ at file{bar.m} in Octave's path.
-
- @example
- @group
---- octave2.9-2.9.10.orig/doc/interpreter/var.txi
-+++ octave2.9-2.9.10/doc/interpreter/var.txi
-@@ -229,11 +229,6 @@
- Octave was compiled (for example, @code{x86_64-unknown-linux-gnu}).
-
- @vtable @code
-- at item DEFAULT_LOADPATH
-- at xref{Function Files}.
--
--Default value: @code{".:@var{octave-home}/lib/@var{version}"}.
--
- @item EDITOR
- @xref{Commands For History}.
-
-@@ -244,22 +239,6 @@
-
- Default value: @code{":$PATH"}.
-
-- at item INFO_FILE
-- at xref{Getting Help}.
--
--Default value: @code{"@var{octave-home}/info/octave.info"}.
--
-- at item INFO_PROGRAM
-- at xref{Getting Help}.
--
--Default value: @code{"@var{octave-home}/libexec/octave/@var{version}/exec/@var{arch}/info"}.
--
-- at item LOADPATH
-- at xref{Function Files}.
--
--Default value: @code{":"}, which tells Octave to use the directories
--specified by the built-in variable @code{DEFAULT_LOADPATH}.
--
- @item OCTAVE_HOME
-
- Default value: @code{"@value{OCTAVEHOME}"}.
-@@ -495,9 +474,9 @@
- @section Defaults from the Environment
-
- Octave uses the values of the following environment variables to set the
--default values for the corresponding built-in variables. In addition,
--the values from the environment may be overridden by command-line
--arguments. @xref{Command Line Options}.
-+default values for the corresponding built-in or internal variables.
-+In addition, the values from the environment may be overridden by
-+command-line arguments. @xref{Command Line Options}.
-
- @vtable @code
- @item EDITOR
-@@ -514,19 +493,19 @@
- @item OCTAVE_PATH
- @xref{Function Files}.
-
--Built-in variable: @code{LOADPATH}.
-+Internal variable changed by function @code{path}.
- Command-line argument: @code{--path}.
-
- @item OCTAVE_INFO_FILE
- @xref{Getting Help}.
-
--Built-in variable: @code{INFO_FILE}.
-+Internal variable changed by function @code{info_file}.
- Command-line argument: @code{--info-file}.
-
- @item OCTAVE_INFO_PROGRAM
- @xref{Getting Help}.
-
--Built-in variable: @code{INFO_PROGRAM}.
-+Internal variable changed by function @code{info_program}.
- Command-line argument: @code{--info-program}.
-
- @item OCTAVE_HISTSIZE
---- octave2.9-2.9.10.orig/doc/refcard/refcard.tex
-+++ octave2.9-2.9.10/doc/refcard/refcard.tex
-@@ -558,7 +558,6 @@
- \sec Selected Built-in Variables;
- EDITOR&editor to use with {\tt edit\_history}\cr
- Inf, NaN&IEEE infinity, NaN\cr
--LOADPATH&path to search for function files\cr
- PAGER&program to use to paginate output\cr
- ans&last result not explicitly assigned\cr
- eps&machine precision\cr
---- octave2.9-2.9.10.orig/emacs/octave-mod.el
-+++ octave2.9-2.9.10/emacs/octave-mod.el
-@@ -129,8 +129,8 @@
- (defvar octave-variables
- '("DEFAULT_EXEC_PATH" "DEFAULT_LOADPATH"
- "EDITOR" "EXEC_PATH" "F_DUPFD" "F_GETFD" "F_GETFL" "F_SETFD"
-- "F_SETFL" "I" "IMAGE_PATH" "INFO_FILE" "INFO_PROGRAM" "Inf" "J"
-- "LOADPATH" "NaN" "OCTAVE_VERSION" "O_APPEND" "O_CREAT" "O_EXCL"
-+ "F_SETFL" "I" "IMAGE_PATH" "Inf" "J"
-+ "NaN" "OCTAVE_VERSION" "O_APPEND" "O_CREAT" "O_EXCL"
- "O_NONBLOCK" "O_RDONLY" "O_RDWR" "O_TRUNC" "O_WRONLY" "PAGER" "PS1"
- "PS2" "PS4" "PWD" "SEEK_CUR" "SEEK_END" "SEEK_SET" "__F_DUPFD__"
- "__F_GETFD__" "__F_GETFL__" "__F_SETFD__" "__F_SETFL__" "__I__"
Deleted: octave/trunk/debian/patches/50_dont_resize_empty_dimensions.dpatch
===================================================================
--- octave/trunk/debian/patches/50_dont_resize_empty_dimensions.dpatch 2007-05-23 10:46:29 UTC (rev 930)
+++ octave/trunk/debian/patches/50_dont_resize_empty_dimensions.dpatch 2007-05-23 21:22:25 UTC (rev 931)
@@ -1,188 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_dont_resize_empty_dimensions.dpatch by Thomas Weber <thomas.weber.mail at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Bugfix for #417671
-## DP: http://www.nabble.com/Reshape-matrix-bug-tf3515922.html
-
- at DPATCH@
-diff -urNad octave2.9-2.9.10~/liboctave/Array.cc octave2.9-2.9.10/liboctave/Array.cc
---- octave2.9-2.9.10~/liboctave/Array.cc 2007-03-07 19:20:46.000000000 +0100
-+++ octave2.9-2.9.10/liboctave/Array.cc 2007-04-04 15:06:48.000000000 +0200
-@@ -3094,7 +3094,9 @@
- // index is a colon the new dimension is singleton.
-
- if (i < lhs_dims_len
-- && (idx(i).is_colon () || idx(i).max () < lhs_dims(i)))
-+ && (idx(i).is_colon ()
-+ || idx(i).orig_empty ()
-+ || idx(i).max () < lhs_dims(i)))
- new_dims(i) = lhs_dims(i);
- else if (! idx(i).is_colon ())
- new_dims(i) = idx(i).max () + 1;
-diff -urNad octave2.9-2.9.10~/test/test_slice.m octave2.9-2.9.10/test/test_slice.m
---- octave2.9-2.9.10~/test/test_slice.m 1970-01-01 01:00:00.000000000 +0100
-+++ octave2.9-2.9.10/test/test_slice.m 2007-04-04 15:06:54.000000000 +0200
-@@ -0,0 +1,162 @@
-+%!function x = set_slice(size, dim, slice)
-+%! x = ones(size);
-+%! switch dim
-+%! case 11
-+%! x(slice) = 2;
-+%! case 21
-+%! x(slice, :) = 2;
-+%! case 22
-+%! x(:, slice) = 2;
-+%! case 31
-+%! x(slice, :, :) = 2;
-+%! case 32
-+%! x(:, slice, :) = 2;
-+%! case 33
-+%! x(:, :, slice) = 2;
-+%! otherwise
-+%! error("invalid dim, '%d'", dim);
-+%! endswitch
-+%! endfunction
-+
-+## size = [2 0]
-+%!assert(set_slice([2 0], 11, []), zeros([2 0]));
-+%!error <A\(I\) = X: unable to resize A> set_slice([2 0], 11, 1)
-+%!error <A\(I\) = X: unable to resize A> set_slice([2 0], 11, 2)
-+%!error <A\(I\) = X: unable to resize A> set_slice([2 0], 11, 3)
-+%!assert(set_slice([2 0], 21, []), zeros([2 0]));
-+%!assert(set_slice([2 0], 21, 1), zeros([2 0]));
-+%!assert(set_slice([2 0], 21, 2), zeros([2 0]));
-+%!assert(set_slice([2 0], 21, 3), zeros([3 0]));
-+%!assert(set_slice([2 0], 22, []), zeros([2 0]));
-+%!assert(set_slice([2 0], 22, 1), [2 2]');
-+%!assert(set_slice([2 0], 22, 2), [0 0;2 2]');
-+%!assert(set_slice([2 0], 22, 3), [0 0;0 0;2 2]');
-+%!assert(set_slice([2 0], 31, []), zeros([2 0]));
-+%!assert(set_slice([2 0], 31, 1), zeros([2 0]));
-+%!assert(set_slice([2 0], 31, 2), zeros([2 0]));
-+%!assert(set_slice([2 0], 31, 3), zeros([3 0]));
-+%!assert(set_slice([2 0], 32, []), zeros([2 0]));
-+%!assert(set_slice([2 0], 32, 1), [2 2]');
-+%!assert(set_slice([2 0], 32, 2), [0 0;2 2]');
-+%!assert(set_slice([2 0], 32, 3), [0 0;0 0;2 2]');
-+%!assert(set_slice([2 0], 33, []), zeros([2 0]));
-+%!assert(set_slice([2 0], 33, 1), zeros([2 0]));
-+%!assert(set_slice([2 0], 33, 2), zeros([2 0 2]));
-+%!assert(set_slice([2 0], 33, 3), zeros([2 0 3]));
-+
-+## size = [0 2]
-+%!assert(set_slice([0 2], 11, []), zeros([0 2]));
-+%!error <A\(I\) = X: unable to resize A> set_slice([0 2], 11, 1)
-+%!error <A\(I\) = X: unable to resize A> set_slice([0 2], 11, 2)
-+%!error <A\(I\) = X: unable to resize A> set_slice([0 2], 11, 3)
-+%!assert(set_slice([0 2], 21, []), zeros([0 2]));
-+%!assert(set_slice([0 2], 21, 1), [2 2]);
-+%!assert(set_slice([0 2], 21, 2), [0 0;2 2]);
-+%!assert(set_slice([0 2], 21, 3), [0 0;0 0;2 2]);
-+%!assert(set_slice([0 2], 22, []), zeros([0 2]));
-+%!assert(set_slice([0 2], 22, 1), zeros([0 2]));
-+%!assert(set_slice([0 2], 22, 2), zeros([0 2]));
-+%!assert(set_slice([0 2], 22, 3), zeros([0 3]));
-+%!assert(set_slice([0 2], 31, []), zeros([0 2]));
-+%!assert(set_slice([0 2], 31, 1), [2 2]);
-+%!assert(set_slice([0 2], 31, 2), [0 0;2 2]);
-+%!assert(set_slice([0 2], 31, 3), [0 0;0 0;2 2]);
-+%!assert(set_slice([0 2], 32, []), zeros([0 2]));
-+%!assert(set_slice([0 2], 32, 1), zeros([0 2]));
-+%!assert(set_slice([0 2], 32, 2), zeros([0 2]));
-+%!assert(set_slice([0 2], 32, 3), zeros([0 3]));
-+%!assert(set_slice([0 2], 33, []), zeros([0 2]));
-+%!assert(set_slice([0 2], 33, 1), zeros([0 2]));
-+%!assert(set_slice([0 2], 33, 2), zeros([0 2 2]));
-+%!assert(set_slice([0 2], 33, 3), zeros([0 2 3]));
-+
-+## size = [2 1]
-+%!assert(set_slice([2 1], 11, []), ones([2 1]));
-+%!assert(set_slice([2 1], 11, 1), [2 1]');
-+%!assert(set_slice([2 1], 11, 2), [1 2]');
-+%!assert(set_slice([2 1], 11, 3), [1 1 2]');
-+%!assert(set_slice([2 1], 11, 4), [1 1 0 2]');
-+%!assert(set_slice([2 1], 21, []), ones([2 1]));
-+%!assert(set_slice([2 1], 21, 1), [2 1]');
-+%!assert(set_slice([2 1], 21, 2), [1 2]');
-+%!assert(set_slice([2 1], 21, 3), [1 1 2]');
-+%!assert(set_slice([2 1], 21, 4), [1 1 0 2]');
-+%!assert(set_slice([2 1], 22, []), ones([2 1]));
-+%!assert(set_slice([2 1], 22, 1), [2 2]');
-+%!assert(set_slice([2 1], 22, 2), [1 1;2 2]');
-+%!assert(set_slice([2 1], 22, 3), [1 1;0 0;2 2]');
-+%!assert(set_slice([2 1], 31, []), ones([2 1]));
-+%!assert(set_slice([2 1], 31, 1), [2 1]');
-+%!assert(set_slice([2 1], 31, 2), [1 2]');
-+%!assert(set_slice([2 1], 31, 3), [1 1 2]');
-+%!assert(set_slice([2 1], 31, 4), [1 1 0 2]');
-+%!assert(set_slice([2 1], 32, []), ones([2 1]));
-+%!assert(set_slice([2 1], 32, 1), [2 2]');
-+%!assert(set_slice([2 1], 32, 2), [1 1;2 2]');
-+%!assert(set_slice([2 1], 32, 3), [1 1;0 0;2 2]');
-+%!assert(set_slice([2 1], 33, []), ones([2 1]));
-+%!assert(set_slice([2 1], 33, 1), [2 2]');
-+%!assert(set_slice([2 1], 33, 2), reshape([1 1 2 2],[2 1 2]));
-+%!assert(set_slice([2 1], 33, 3), reshape([1 1 0 0 2 2],[2 1 3]));
-+
-+## size = [1 2]
-+%!assert(set_slice([1 2], 11, []), ones([1 2]));
-+%!assert(set_slice([1 2], 11, 1), [2 1]);
-+%!assert(set_slice([1 2], 11, 2), [1 2]);
-+%!assert(set_slice([1 2], 11, 3), [1 1 2]);
-+%!assert(set_slice([1 2], 11, 4), [1 1 0 2]);
-+%!assert(set_slice([1 2], 21, []), ones([1 2]));
-+%!assert(set_slice([1 2], 21, 1), [2 2]);
-+%!assert(set_slice([1 2], 21, 2), [1 1;2 2]);
-+%!assert(set_slice([1 2], 21, 3), [1 1;0 0;2 2]);
-+%!assert(set_slice([1 2], 22, []), ones([1 2]));
-+%!assert(set_slice([1 2], 22, 1), [2 1]);
-+%!assert(set_slice([1 2], 22, 2), [1 2]);
-+%!assert(set_slice([1 2], 22, 3), [1 1 2]);
-+%!assert(set_slice([1 2], 22, 4), [1 1 0 2]);
-+%!assert(set_slice([1 2], 31, []), ones([1 2]));
-+%!assert(set_slice([1 2], 31, 1), [2 2]);
-+%!assert(set_slice([1 2], 31, 2), [1 1;2 2]);
-+%!assert(set_slice([1 2], 31, 3), [1 1;0 0;2 2]);
-+%!assert(set_slice([1 2], 32, []), ones([1 2]));
-+%!assert(set_slice([1 2], 32, 1), [2 1]);
-+%!assert(set_slice([1 2], 32, 2), [1 2]);
-+%!assert(set_slice([1 2], 32, 3), [1 1 2]);
-+%!assert(set_slice([1 2], 32, 4), [1 1 0 2]);
-+%!assert(set_slice([1 2], 33, []), ones([1 2]));
-+%!assert(set_slice([1 2], 33, 1), [2 2]);
-+%!assert(set_slice([1 2], 33, 2), reshape([1 1 2 2],[1 2 2]));
-+%!assert(set_slice([1 2], 33, 3), reshape([1 1 0 0 2 2],[1 2 3]));
-+
-+## size = [2 2]
-+%!assert(set_slice([2 2], 11, []), ones([2 2]));
-+%!assert(set_slice([2 2], 11, 1), [2 1;1 1]);
-+%!assert(set_slice([2 2], 11, 2), [1 1;2 1]);
-+%!assert(set_slice([2 2], 11, 3), [1 2;1 1]);
-+%!assert(set_slice([2 2], 11, 4), [1 1;1 2]);
-+%!error <invalid matrix index = 5> set_slice([2 2], 11, 5)
-+%!error <invalid matrix index = 6> set_slice([2 2], 11, 6)
-+%!assert(set_slice([2 2], 21, []), ones([2 2]));
-+%!assert(set_slice([2 2], 21, 1), [2 2;1 1]);
-+%!assert(set_slice([2 2], 21, 2), [1 1;2 2]);
-+%!assert(set_slice([2 2], 21, 3), [1 1;1 1;2 2]);
-+%!assert(set_slice([2 2], 21, 4), [1 1;1 1;0 0;2 2]);
-+%!assert(set_slice([2 2], 22, []), ones([2 2]));
-+%!assert(set_slice([2 2], 22, 1), [2 2;1 1]');
-+%!assert(set_slice([2 2], 22, 2), [1 1;2 2]');
-+%!assert(set_slice([2 2], 22, 3), [1 1;1 1;2 2]');
-+%!assert(set_slice([2 2], 22, 4), [1 1;1 1;0 0;2 2]');
-+%!assert(set_slice([2 2], 31, []), ones([2 2]));
-+%!assert(set_slice([2 2], 31, 1), [2 2;1 1]);
-+%!assert(set_slice([2 2], 31, 2), [1 1;2 2]);
-+%!assert(set_slice([2 2], 31, 3), [1 1;1 1;2 2]);
-+%!assert(set_slice([2 2], 31, 4), [1 1;1 1;0 0;2 2]);
-+%!assert(set_slice([2 2], 32, []), ones([2 2]));
-+%!assert(set_slice([2 2], 32, 1), [2 2;1 1]');
-+%!assert(set_slice([2 2], 32, 2), [1 1;2 2]');
-+%!assert(set_slice([2 2], 32, 3), [1 1;1 1;2 2]');
-+%!assert(set_slice([2 2], 32, 4), [1 1;1 1;0 0;2 2]');
-+%!assert(set_slice([2 2], 33, []), ones([2 2]));
-+%!assert(set_slice([2 2], 33, 1), [2 2;2 2]);
-+%!assert(set_slice([2 2], 33, 2), reshape([1 1 1 1 2 2 2 2],[2 2 2]));
-+%!assert(set_slice([2 2], 33, 3), reshape([1 1 1 1 0 0 0 0 2 2 2 2],[2 2 3]));
Deleted: octave/trunk/debian/patches/50_examples-use-gnuclient.dpatch
===================================================================
--- octave/trunk/debian/patches/50_examples-use-gnuclient.dpatch 2007-05-23 10:46:29 UTC (rev 930)
+++ octave/trunk/debian/patches/50_examples-use-gnuclient.dpatch 2007-05-23 21:22:25 UTC (rev 931)
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_examples-use-gnuclient.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Use gnuclient instead of the deprecated gnudoit in the info-emacs-*
-## DP: examples
-
- at DPATCH@
-
---- octave2.9-2.9.10.orig/examples/info-emacs-info
-+++ octave2.9-2.9.10/examples/info-emacs-info
-@@ -11,4 +11,4 @@
- fi
- cmd="(require 'info) $cmd"
- [ $4 ] && cmd="$cmd (Info-index \"$4\")"
--gnudoit -q $cmd
-+gnuclient -batch -q -eval "$cmd"
---- octave2.9-2.9.10.orig/examples/info-emacs-octave-help
-+++ octave2.9-2.9.10/examples/info-emacs-octave-help
-@@ -11,4 +11,4 @@
- shift 2
- fi
- cmd="$cmd (octave-help \"$4\")"
--gnudoit -q $cmd
-+gnuclient -batch -q -eval "$cmd"
Deleted: octave/trunk/debian/patches/50_fft_with_empty_matrix.dpatch
===================================================================
--- octave/trunk/debian/patches/50_fft_with_empty_matrix.dpatch 2007-05-23 10:46:29 UTC (rev 930)
+++ octave/trunk/debian/patches/50_fft_with_empty_matrix.dpatch 2007-05-23 21:22:25 UTC (rev 931)
@@ -1,51 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_fft_with_empty_matrix.dpatch by <root at asterix.num.uni-sb.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Bug fix for #423278; synced with upstream CVS
-
- at DPATCH@
-diff -urNad octave2.9-2.9.10~/src/DLD-FUNCTIONS/fft.cc octave2.9-2.9.10/src/DLD-FUNCTIONS/fft.cc
---- octave2.9-2.9.10~/src/DLD-FUNCTIONS/fft.cc 2006-05-19 05:32:18.000000000 +0000
-+++ octave2.9-2.9.10/src/DLD-FUNCTIONS/fft.cc 2007-05-16 13:47:31.000000000 +0000
-@@ -99,7 +99,7 @@
- if (dim < 0)
- {
- for (octave_idx_type i = 0; i < dims.length (); i++)
-- if ( dims(i) > 1)
-+ if (dims(i) > 1)
- {
- dim = i;
- break;
-@@ -115,8 +115,8 @@
- else
- dims (dim) = n_points;
-
-- if (dims.all_zero () || n_points == 0)
-- return octave_value (Matrix ());
-+ if (dims.any_zero () || n_points == 0)
-+ return octave_value (NDArray (dims));
-
- if (arg.is_real_type ())
- {
-@@ -146,6 +146,20 @@
- return retval;
- }
-
-+/*
-+
-+%!error(fft())
-+%!assert(fft([]), [])
-+%!assert(fft(zeros(10,0)), zeros(10,0))
-+%!assert(fft(zeros(0,10)), zeros(0,10))
-+%!assert(fft(0), 0)
-+%!assert(fft(1), 1)
-+%!assert(fft(1), 1)
-+%!assert(fft(ones(2,2)), [2,2; 0,0])
-+%!assert(fft(eye(2,2)), [1,1; 1,-1])
-+
-+*/
-+
-
- DEFUN_DLD (fft, args, ,
- "-*- texinfo -*-\n\
Deleted: octave/trunk/debian/patches/50_glpk-pre-ifdef-logic.dpatch
===================================================================
--- octave/trunk/debian/patches/50_glpk-pre-ifdef-logic.dpatch 2007-05-23 10:46:29 UTC (rev 930)
+++ octave/trunk/debian/patches/50_glpk-pre-ifdef-logic.dpatch 2007-05-23 21:22:25 UTC (rev 931)
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_glpk-pre-ifdef-logic.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Fixed #ifdef logic around macro GLPK_PRE_4_14, which was causing
-## DP: an extra closing brace to be introduced for the extern "C"
-## DP: declaration when GLPK_PRE_4_14 was not defined. This patch has been
-## DP: sent to bug at octave.org.
-
-
- at DPATCH@
-
---- octave2.9-2.9.10.orig/src/DLD-FUNCTIONS/__glpk__.cc
-+++ octave2.9-2.9.10/src/DLD-FUNCTIONS/__glpk__.cc
-@@ -53,17 +53,14 @@
- #ifndef lib_set_print_hook
- #define lib_set_print_hook lib_print_hook
- #endif
--}
-
- #else
-
--extern "C"
--{
- void _glp_lib_print_hook (int (*func)(void *info, char *buf), void *info);
- void _glp_lib_fault_hook (int (*func)(void *info, char *buf), void *info);
--}
-
- #endif
-+}
-
- #define NIntP 17
- #define NRealP 10
More information about the Pkg-octave-commit
mailing list