[Pkg-octave-commit] rev 768 - in trunk/packages/octave/debian: . in patches

Fri Oct 6 21:51:02 UTC 2006

Author: thomas-guest
Date: 2006-10-06 21:51:02 +0000 (Fri, 06 Oct 2006)
New Revision: 768

Added:
   trunk/packages/octave/debian/patches/50_fix_hold_state.dpatch
Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/in/control
   trunk/packages/octave/debian/in/octave2.9-00list
Log:
Since 2.9.5, Octave has some functionality which needs pcre.
Patch for #391033 => we need flex


Modified: trunk/packages/octave/debian/changelog
===================================================================

--- trunk/packages/octave/debian/changelog	2006-10-03 17:12:48 UTC (rev 767)
+++ trunk/packages/octave/debian/changelog	2006-10-06 21:51:02 UTC (rev 768)
@@ -1,3 +1,16 @@
+octave2.9 (2.9.9-2) unstable; urgency=low
+
+  NOT YET RELEASED!
+
+  [ Thomas Weber ]
+  * debian/in/control: Add pcre to build-dependencies. It's needed since
+    2.9.5 for some features.
+  * debian/patches/50_fix_hold_state.dpatch: correct a problem when using
+    clearplot; and hold on; (Closes: #391033), thanks John W. Eaton This
+    patch changes a .l file, so we build-depend on flex in debian/control!
+
+ --
+
 octave2.9 (2.9.9-1) unstable; urgency=low
 
   [ Rafael Laboissiere ]

Modified: trunk/packages/octave/debian/in/control
===================================================================
--- trunk/packages/octave/debian/in/control	2006-10-03 17:12:48 UTC (rev 767)
+++ trunk/packages/octave/debian/in/control	2006-10-06 21:51:02 UTC (rev 768)
@@ -8,7 +8,7 @@
  libhdf5-serial-dev (>= 1.6.5) | libhdf5-lam-dev (>= 1.6.5)
  | libhdf5-mpich-dev (>= 1.6.5), refblas3-dev | atlas3-base-dev,
  lapack3-dev | atlas3-base-dev, gnuplot-nox, fftw3-dev, dejagnu, texi2html,
- less, dpatch, slice[V_2_9:, glpk, libglpk0, libufsparse-dev:]
+ libpcre3-dev, less, dpatch, slice[V_2_9:, glpk, libglpk0, libufsparse-dev:]
 Standards-Version: 3.7.2
 
 Package: octave[V_2_1:2.1:][V_2_9:2.9:]

Modified: trunk/packages/octave/debian/in/octave2.9-00list
===================================================================
--- trunk/packages/octave/debian/in/octave2.9-00list	2006-10-03 17:12:48 UTC (rev 767)
+++ trunk/packages/octave/debian/in/octave2.9-00list	2006-10-06 21:51:02 UTC (rev 768)
@@ -1,3 +1,4 @@
 50_octave-bug-tempfile
 50_clean-mat-files
 50_mkoctifle-man-indent-option
+50_fix_hold_state.dpatch

Added: trunk/packages/octave/debian/patches/50_fix_hold_state.dpatch
===================================================================
--- trunk/packages/octave/debian/patches/50_fix_hold_state.dpatch	                        (rev 0)
+++ trunk/packages/octave/debian/patches/50_fix_hold_state.dpatch	2006-10-06 21:51:02 UTC (rev 768)
@@ -0,0 +1,101 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_fix_hold_state.dpatch by  <root at localhost>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad octave2.9-2.9.9~/scripts/plot/__clear_plot__.m octave2.9-2.9.9/scripts/plot/__clear_plot__.m
+--- octave2.9-2.9.9~/scripts/plot/__clear_plot__.m	1970-01-01 01:00:00.000000000 +0100
++++ octave2.9-2.9.9/scripts/plot/__clear_plot__.m	2006-10-06 16:20:23.900513248 +0200
+@@ -0,0 +1,42 @@
++## Copyright (C) 2006 John W. Eaton
++##
++## This file is part of Octave.
++##
++## Octave is free software; you can redistribute it and/or modify it
++## under the terms of the GNU General Public License as published by
++## the Free Software Foundation; either version 2, or (at your option)
++## any later version.
++##
++## Octave is distributed in the hope that it will be useful, but
++## WITHOUT ANY WARRANTY; without even the implied warranty of
++## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++## General Public License for more details.
++##
++## You should have received a copy of the GNU General Public License
++## along with Octave; see the file COPYING.  If not, write to the Free
++## Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++## 02110-1301, USA.
++
++function __clear_plot__ (cmd, sep, clear_data)
++
++  __plot_globals__
++
++  if (nargin < 3)
++    clear_data = true;
++    if (nargin < 2)
++      sep = "";
++      if (nargin < 1)
++       cmd = "";
++      endif
++    endif
++  endif
++
++  __plot_command__{__current_figure__}{__multiplot_xi__,__multiplot_yi__} = cmd;
++  __plot_command_sep__ = sep;
++
++  if (clear_data)
++    __plot_data__{__current_figure__}{__multiplot_xi__,__multiplot_yi__} = [];
++    __plot_data_offset__{__current_figure__}(__multiplot_xi__,__multiplot_yi__) = 1;
++  endif
++
++endfunction
+diff -urNad octave2.9-2.9.9~/scripts/plot/__setup_plot__.m octave2.9-2.9.9/scripts/plot/__setup_plot__.m
+--- octave2.9-2.9.9~/scripts/plot/__setup_plot__.m	2006-09-26 23:16:52.000000000 +0200
++++ octave2.9-2.9.9/scripts/plot/__setup_plot__.m	2006-10-06 16:20:23.900513248 +0200
+@@ -22,16 +22,20 @@
+   __plot_globals__
+ 
+   if (ishold ())
+-    if (isempty (__plot_command__{__current_figure__}{__multiplot_xi__,__multiplot_yi__}))
+-      __plot_command__{__current_figure__}{__multiplot_xi__,__multiplot_yi__} = plotcmd;
+-      __plot_command_sep__ = "";
++    cmd = __plot_command__{__current_figure__}{__multiplot_xi__,__multiplot_yi__};
++    if (isempty (cmd))
++      cmd = plotcmd;
++      sep = "";
+     else
+-      __plot_command_sep__ = ",\\\n";
++      sep = ",\\\n";
+     endif
++    clear_data = false;
+   else
+-    __plot_command__{__current_figure__}{__multiplot_xi__,__multiplot_yi__} = plotcmd;
+-    __plot_command_sep__ = "";
+-    __plot_data__{__current_figure__}{__multiplot_xi__,__multiplot_yi__} = [];
+-    __plot_data_offset__{__current_figure__}(__multiplot_xi__,__multiplot_yi__) = 1;
++    cmd = plotcmd;
++    sep = "";
++    clear_data = true;
+   endif
++
++  __clear_plot__ (cmd, sep, clear_data);
++
+ endfunction
+diff -urNad octave2.9-2.9.9~/src/DLD-FUNCTIONS/__gnuplot_raw__.l octave2.9-2.9.9/src/DLD-FUNCTIONS/__gnuplot_raw__.l
+--- octave2.9-2.9.9~/src/DLD-FUNCTIONS/__gnuplot_raw__.l	2006-08-23 21:54:47.000000000 +0200
++++ octave2.9-2.9.9/src/DLD-FUNCTIONS/__gnuplot_raw__.l	2006-10-06 16:20:23.901513036 +0200
+@@ -1601,9 +1601,11 @@
+   octave_value_list args;
+ 
+   args(0) = "off";
+-
+   feval ("hold", args);
+ 
++  args.resize (0);
++  feval ("__clear_plot__", args);
++
+   return octave_value_list ();
+ }
+ 


Property changes on: trunk/packages/octave/debian/patches/50_fix_hold_state.dpatch
___________________________________________________________________
Name: svn:executable
   + *


