[Pkg-octave-commit] [SCM] Debian packaging for octave branch, master, updated. 3.2.2-2-102-g2b393c2
Thomas Weber
tweber at debian.org
Wed Dec 7 17:56:10 UTC 2011
The following commit has been merged in the master branch:
commit e51f18c2414d05009596b3009e9ed69f0c426576
Author: Thomas Weber <tweber at debian.org>
Date: Mon Nov 14 21:56:20 2011 +0100
Remove patches from the 3.0 series from the tree
Git-Dch: Ignore
diff --git a/debian/in/series b/debian/in/series
index 43deb20..6c88682 100644
--- a/debian/in/series
+++ b/debian/in/series
@@ -1,14 +1,4 @@
-[V_3_0:
-50_octave-bug-tempfile.diff
-50_fix_handle_for_plotyy.diff
-no_pdf_in_print.diff
-dont_set_helvetica.diff
-glpk-new-api.diff
-real-no-history.diff
-termios-h-check-3.0.diff
-no-argout-intersect.diff
-datenum-vector-input-any-orientation.diff
-:][V_3_2:
+[V_3_2:
drop_old_curl_header
scale_image_point_color
fix-interp2
diff --git a/debian/patches/50_fix_handle_for_plotyy.diff b/debian/patches/50_fix_handle_for_plotyy.diff
deleted file mode 100644
index 8a595c3..0000000
--- a/debian/patches/50_fix_handle_for_plotyy.diff
+++ /dev/null
@@ -1,76 +0,0 @@
-Apply patch from David Bateman to fix the handle treatment in plotyy
-(closes: #472069).
-
- -- Thomas Weber <thomas.weber.mail at gmail.com> Sat, 29 Mar 2008 10:32:15 +0100
-
-diff -urNad octave3.0-3.0.0~/scripts/plot/plotyy.m octave3.0-3.0.0/scripts/plot/plotyy.m
---- octave3.0-3.0.0~/scripts/plot/plotyy.m 2007-12-13 18:48:59.000000000 +0100
-+++ octave3.0-3.0.0/scripts/plot/plotyy.m 2008-03-28 12:20:12.000000000 +0100
-@@ -55,7 +55,37 @@
-
- function [Ax, H1, H2] = plotyy (varargin)
-
-- [ax, varargin] = __plt_get_axis_arg__ ("plotyy", varargin{:});
-+ ## Don't use __plt_get_axis_arg__ here as ax is a two vector for plotyy
-+ if (nargin > 1 && length (varargin{1}) == 2 && ishandle(varargin{1}(1))
-+ && ishandle(varargin{1}(2)) &&
-+ all (floor (varargin{1}) != varargin{1}))
-+ obj1 = get (varargin{1}(1));
-+ obj2 = get (varargin{1}(2));
-+ if (strcmp (obj1.type, "axes") || strcmp (obj2.type, "axes"))
-+ ax = [obj1, obj2];
-+ varargin(1) = [];
-+ if (isempty (varargin))
-+ varargin = {};
-+ endif
-+ else
-+ error ("plotyy: expecting first argument to be axes handle");
-+ endif
-+ else
-+ f = get (0, "currentfigure");
-+ if (isempty (f))
-+ ax(1) = axes ();
-+ ax(2) = axes ();
-+ else
-+ ax = get (f, "children");
-+ for i = 3 : length (ax)
-+ delete (ax (i));
-+ endfor
-+ ax = ax(1:2);
-+ endif
-+ if (nargin < 2)
-+ varargin = {};
-+ endif
-+ endif
-
- if (nargin < 4)
- print_usage ();
-@@ -63,8 +93,6 @@
-
- oldh = gca ();
- unwind_protect
-- axes (ax);
-- newplot ();
- [ax, h1, h2] = __plotyy__ (ax, varargin{:});
- unwind_protect_cleanup
- axes (oldh);
-@@ -92,6 +120,8 @@
-
- xlim = [min([x1(:); x2(:)]), max([x1(:); x2(:)])];
-
-+ axes (ax(1));
-+ newplot ();
- h1 = feval (fun1, x1, y1);
-
- set (ax(1), "ycolor", getcolor (h1(1)));
-@@ -101,7 +131,9 @@
-
- cf = gcf ();
- set (cf, "nextplot", "add");
-- ax(2) = axes ();
-+ axes (ax(2));
-+ newplot ();
-+
- colors = get (ax(1), "colororder");
- set (ax(2), "colororder", [colors(2:end,:); colors(1,:)]);
-
diff --git a/debian/patches/datenum-vector-input-any-orientation.diff b/debian/patches/datenum-vector-input-any-orientation.diff
deleted file mode 100644
index 52a21ff..0000000
--- a/debian/patches/datenum-vector-input-any-orientation.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: datenum: allow vector inputs in any orientation
-Author: author Bill Denney
-Date: Thu Mar 27 15:17:53 2008 -0400
-
-Taken from upstream Mercurial repository at:
-http://hg.savannah.gnu.org/hgweb/octave/raw-rev/4ab2488ab2b4
-
- -- Rafael Laboissiere <rafael at debian.org> Sat, 23 May 2009 15:14:52 +0200
-
---- a/scripts/time/datenum.m Thu Mar 27 15:14:10 2008 -0400
-+++ b/scripts/time/datenum.m Thu Mar 27 15:17:53 2008 -0400
-@@ -1,4 +1,4 @@
--## Copyright (C) 2006, 2007 Paul Kienzle
-+## Copyright (C) 2006, 2007, 2008 Paul Kienzle
- ##
- ## This file is part of Octave.
- ##
-@@ -99,7 +99,7 @@
- Y += fix ((M-14)/12);
-
- ## Lookup number of days since start of the current year.
-- D += monthstart (mod (M-1,12) + 1) + 60;
-+ D += reshape (monthstart (mod (M-1,12) + 1), size (D)) + 60;
-
- ## Add number of days to the start of the current year. Correct
- ## for leap year every 4 years except centuries not divisible by 400.
-@@ -120,7 +120,13 @@
- %!assert(datenum([2001,5,19;1417,6,12]), [730990;517712])
- %!assert(datenum(2001,5,19,12,21,3.5), 730990+part, eps)
- %!assert(datenum([1417,6,12,12,21,3.5]), 517712+part, eps)
-+## Test vector inputs
- %!test
- %! t = [2001,5,19,12,21,3.5; 1417,6,12,12,21,3.5];
- %! n = [730990; 517712] + part;
- %! assert(datenum(t), n, 2*eps);
-+## Make sure that the vectors can have either orientation
-+%!test
-+%! t = [2001,5,19,12,21,3.5; 1417,6,12,12,21,3.5]';
-+%! n = [730990 517712] + part;
-+%! assert(datenum(t(1,:), t(2,:), t(3,:), t(4,:), t(5,:), t(6,:)), n, 2*eps);
-
diff --git a/debian/patches/dont_set_helvetica.diff b/debian/patches/dont_set_helvetica.diff
deleted file mode 100644
index 6e4497f..0000000
--- a/debian/patches/dont_set_helvetica.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-Don't set Helvetica as default font, it's not available as TrueType
-font. Fixes Bug#477688.
-
- -- Thomas Weber <thomas.weber.mail at gmail.com> Sat, 24 May 2008 13:49:51 +0200
-
-diff -urNad octave3.0-3.0.1~/scripts/plot/__go_draw_axes__.m octave3.0-3.0.1/scripts/plot/__go_draw_axes__.m
---- octave3.0-3.0.1~/scripts/plot/__go_draw_axes__.m 2008-04-21 18:00:20.000000000 +0200
-+++ octave3.0-3.0.1/scripts/plot/__go_draw_axes__.m 2008-05-25 17:30:08.000000000 +0200
-@@ -1601,7 +1601,7 @@
-
- function [f, s, fnt, it, bld] = get_fontname_and_size (t)
- if (isempty (t.fontname))
-- fnt = "Helvetica";
-+ fnt = "*";
- else
- fnt = t.fontname;
- endif
-@@ -1639,7 +1639,7 @@
- if (strcmp (fld, "string"))
- [f, s, fnt, it, bld] = get_fontname_and_size (obj);
- else
-- f = "Helvetica";
-+ f = "*";
- s = 10;
- fnt = f;
- it = false;
-diff -urNad octave3.0-3.0.1~/src/graphics.cc octave3.0-3.0.1/src/graphics.cc
---- octave3.0-3.0.1~/src/graphics.cc 2008-04-21 18:00:20.000000000 +0200
-+++ octave3.0-3.0.1/src/graphics.cc 2008-05-25 17:30:08.000000000 +0200
-@@ -2336,7 +2336,7 @@
- rotation (0),
- horizontalalignment ("left"),
- color (Matrix (1, 3, 0.0)),
-- fontname ("Helvetica"),
-+ fontname ("*"),
- fontsize (10),
- fontangle (radio_values ("{normal}|italic|oblique")),
- fontweight (radio_values ("{normal}|bold|demi|light")),
-@@ -2470,7 +2470,7 @@
- m["rotation"] = 0;
- m["horizontalalignment"] = "left";
- m["color"] = Matrix (1, 3, 1.0);
-- m["fontname"] = "Helvetica";
-+ m["fontname"] = "*";
- m["fontsize"] = 10;
- m["fontangle"] = radio_property (radio_values ("{normal}|italic|oblique"));
- m["fontweight"] = radio_property (radio_values ("{normal}|bold|demi|light"));
diff --git a/debian/patches/glpk-new-api.diff b/debian/patches/glpk-new-api.diff
deleted file mode 100644
index 5e4938d..0000000
--- a/debian/patches/glpk-new-api.diff
+++ /dev/null
@@ -1,77 +0,0 @@
-Avoid calls to deprecated __glp_lib_* functions which are deprecated
-and have been removed for the GLPK public API since version 4.32.
-
-Taken from the Mercurial usptream repostory:
-http://hg.savannah.gnu.org/hgweb/octave/raw-diff/aaccb1362347/src/DLD-FUNCTIONS/__glpk__.cc
-
- -- Rafael Laboissiere <rafael at debian.org> Wed, 04 Feb 2009 11:56:17 +0100
-
---- a/src/DLD-FUNCTIONS/__glpk__.cc Wed Aug 27 09:59:55 2008 -0400
-+++ b/src/DLD-FUNCTIONS/__glpk__.cc Mon Oct 27 14:25:30 2008 -0400
-@@ -45,6 +45,7 @@
- #include <glpk.h>
- #endif
-
-+#if 0
- #ifdef GLPK_PRE_4_14
-
- #ifndef _GLPLIB_H
-@@ -62,6 +63,7 @@
- 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
- #endif
- }
-
-@@ -137,6 +139,7 @@
-
- static jmp_buf mark; //-- Address for long jump to jump to
-
-+#if 0
- int
- glpk_fault_hook (void * /* info */, char *msg)
- {
-@@ -150,6 +153,7 @@
- message (0, "%s", msg);
- return 1;
- }
-+#endif
-
- int
- glpk (int sense, int n, int m, double *c, int nz, int *rn, int *cn,
-@@ -164,6 +168,7 @@
-
- clock_t t_start = clock();
-
-+#if 0
- #ifdef GLPK_PRE_4_14
- lib_set_fault_hook (0, glpk_fault_hook);
- #else
-@@ -175,6 +180,7 @@
- lib_set_print_hook (0, glpk_print_hook);
- #else
- _glp_lib_print_hook (glpk_print_hook, 0);
-+#endif
- #endif
-
- LPX *lp = lpx_create_prob ();
-@@ -314,11 +320,14 @@
- break;
-
- default:
-+ break;
-+#if 0
- #ifdef GLPK_PRE_4_14
- insist (method != method);
- #else
- static char tmp[] = "method != method";
- glpk_fault_hook (0, tmp);
-+#endif
- #endif
- }
-
-
-
-
-
diff --git a/debian/patches/no-argout-intersect.diff b/debian/patches/no-argout-intersect.diff
deleted file mode 100644
index 86ebc82..0000000
--- a/debian/patches/no-argout-intersect.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-Cope with the case where nargout == 0
-This was taken from package bugfix-3.0.5 of Otave Forge
-
- -- Rafael Laboissiere <rafael at debian.org> Fri, 22 May 2009 23:54:24 +0200
-
---- a/scripts/set/intersect.m 2009-02-18 07:57:46.000000000 +0100
-+++ b/scripts/set/intersect.m 2009-05-08 15:16:47.000000000 +0200
-@@ -1,5 +1,5 @@
-+## Copyright (C) 2008, 2009 Jaroslav Hajek
- ## Copyright (C) 2000, 2006, 2007 Paul Kienzle
--## Copyright (C) 2008 Jaroslav Hajek
- ##
- ## This file is part of Octave.
- ##
-@@ -22,7 +22,7 @@
- ## @deftypefnx {Function File} {[@var{c}, @var{ia}, @var{ib}] =} intersect (@var{a}, @var{b})
- ##
- ## Return the elements in both @var{a} and @var{b}, sorted in ascending
--## order. If @var{a} and @var{b} are both column vectors return a column
-+## order. If @var{a} and @var{b} are both column vectors return a column
- ## vector, otherwise return a row vector.
- ##
- ## Return index vectors @var{ia} and @var{ib} such that @code{a(ia)==c} and
-@@ -49,6 +49,9 @@
- if (nargout > 1)
- [a, ja] = unique (a, varargin{:});
- [b, jb] = unique (b, varargin{:});
-+ else
-+ a = unique (a, varargin{:});
-+ b = unique (b, varargin{:});
- endif
-
- if (nargin > 2)
-@@ -87,7 +90,7 @@
- %! a = [3 2 4 5 7 6 5 1 0 13 13];
- %! b = [3 5 12 1 1 7];
- %! [c,ia,ib] = intersect(a,b);
--%! assert( c,[1 3 5 7]);
-+%! assert(c,[1 3 5 7]);
- %! assert(ia,[8 1 7 5]);
- %! assert(ib,[5 1 2 6]);
- %! assert(a(ia),c);
-@@ -101,3 +104,8 @@
- %! assert(ib,[3;1]);
- %! assert(a(ia,:),c);
- %! assert(b(ib,:),c);
-+%!test
-+%! a = [1 1 1 2 2 2];
-+%! b = [1 2 3 4 5 6];
-+%! c = intersect(a,b);
-+%! assert(c, [1,2]);
diff --git a/debian/patches/real-no-history.diff b/debian/patches/real-no-history.diff
deleted file mode 100644
index 88b734e..0000000
--- a/debian/patches/real-no-history.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-Only save history if Vsaving_history is true. Thanks to John Eaton
-for the patch and the comments. Closes Bug#514802.
-
- -- Rafael Laboissiere <rafael at debian.org> Fri, 13 Feb 2009 19:52:37 +0100
-
---- octave3.0-3.0.4~rc3.orig/src/toplev.cc
-+++ octave3.0-3.0.4~rc3/src/toplev.cc
-@@ -643,7 +643,8 @@
-
- octave_history_write_timestamp ();
-
-- command_history::clean_up_and_save ();
-+ if (Vsaving_history)
-+ command_history::clean_up_and_save ();
-
- close_files ();
-
---- octave3.0-3.0.4~rc3.orig/src/oct-hist.cc
-+++ octave3.0-3.0.4~rc3/src/oct-hist.cc
-@@ -534,7 +534,8 @@
- command_history::set_file (Vhistory_file);
- command_history::set_size (Vhistory_size);
-
-- command_history::read (false);
-+ if (Vsaving_history)
-+ command_history::read (false);
- }
-
- void
diff --git a/debian/patches/termios-h-check-3.0.diff b/debian/patches/termios-h-check-3.0.diff
deleted file mode 100644
index 0d29b46..0000000
--- a/debian/patches/termios-h-check-3.0.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Small tweak for configure.in/configure to properly detect <termios.h>,
-making the package build on GNU/kFreeBSD. Thanks to Petr Salinger for
-the patch. Closes Bug#520076 for octave3.0.
-
- -- Rafael Laboissiere <rafael at debian.org> Wed, 18 Mar 2009 11:42:07 +0100
-
---- octave3.1-3.1.54.orig/configure.in
-+++ octave3.1-3.1.54/configure.in
-@@ -1247,7 +1247,7 @@
- AC_LANG_POP(C++)
-
- have_termios_h=no
--AC_CHECK_HEADERS($TERMIOS_H, have_termios_h=yes)
-+AC_CHECK_HEADERS(termios.h, have_termios_h=yes)
- AC_CHECK_HEADERS(termio.h, have_termio_h=yes, have_termio_h=no)
- AC_CHECK_HEADERS(sgtty.h, have_sgtty_h=yes, have_sgtty_h=no)
- AC_CHECK_HEADERS(glob.h, have_glob_h=yes, have_glob_h=no)
--
Debian packaging for octave
More information about the Pkg-octave-commit
mailing list