[Pkg-octave-commit] [SCM] octave-epstk branch, master, updated. d49304a95baeb330382a9bb92a4acfbebee60083
Thomas Weber
tweber at debian.org
Sat Jan 1 21:49:22 UTC 2011
The following commit has been merged in the master branch:
commit 9defa82fbaef660b1c1a7fac9ec2aa3a5a540018
Author: Thomas Weber <tweber at debian.org>
Date: Fri Dec 31 21:50:19 2010 +0100
Drop patch: 01_add-plotdecimate.patch
diff --git a/debian/changelog b/debian/changelog
index f4d9233..ce278be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,15 +8,17 @@ octave-epstk (2.3-1) UNRELEASED; urgency=low
- tickless_axes
- update_documentation
- modern-str-functions
- - Dropped patch:
+ - Dropped patches:
- 04_source-etc-epstk-conf.patch: Upstream changed the configuration
system, so there's no need to source /etc/epstk.conf any longer (it's
symlinked as einit.m)
+ - 01_add-plotdecimate.patch: moved into octave-plot, a 'suggests' for
+ that packages was added.
- New patch: set_debian_defaults: Set sensible defaults in /etc/epstk.conf
* debian/control: Remove Rafael Laboissiere from Uploaders (Closes: #571895)
* Switch to dpkg-source 3.0 (quilt) format
- -- Thomas Weber <thomas.weber.mail at gmail.com> Sun, 28 Feb 2010 22:25:19 +0100
+ -- Thomas Weber <tweber at debian.org> Mon, 27 Dec 2010 10:16:59 +0100
octave-epstk (2.2-15) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 544b05b..44000fa 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-octave/octave-epstk.git
Package: octave-epstk
Architecture: all
Depends: ${octave-3-2:Depends}, ${misc:Depends}
-Suggests: gv | postscript-viewer
+Suggests: gv | postscript-viewer, octave-plot (>= 1.0.8+svn20101230-2)
Description: GNU Octave encapsulated postscript toolkit
The octave-epstk package provides, via a set of .m functions, a toolkit to
create powerful encapsulated postscript (.eps) graphs. Most 2D scientific
diff --git a/debian/copyright b/debian/copyright
index e62778e..fb199ae 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -31,14 +31,6 @@ under the GNU General Public License.
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-The file plotcollapse.m was downloaded from
- http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=365757
-
-It is copyrighted by Francesco Potorti` and released
-under the GNU General Public License.
-
-
The Debian packaging is Copyright (C) 1999-2004 Dirk Eddelbuettel, 2005-2008
Rafael Laboissière, and 2006-2008 Thomas Weber, and is released under the
GNU General Public License, version 3 or later.
diff --git a/debian/patches/01_add-plotdecimate.patch b/debian/patches/01_add-plotdecimate.patch
deleted file mode 100644
index a72c2d6..0000000
--- a/debian/patches/01_add-plotdecimate.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-Author: Rafael Laboissiere <rafael at debian.org>
-Description: Add Francesco Potortì's plotdecimate function, useful for
- data containing NaN
-
-diff -Nur epstk21/m/plotdecimate.m epstk21.new/m/plotdecimate.m
---- epstk21/m/plotdecimate.m 1970-01-01 01:00:00.000000000 +0100
-+++ epstk21.new/m/plotdecimate.m 2006-08-12 20:10:18.330740520 +0200
-@@ -0,0 +1,134 @@
-+## Copyright © 2006 Francesco Potortì
-+##
-+## This program 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 of the License, or
-+## (at your option) any later version.
-+##
-+## This program 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 this program; if not, write to the Free Software Foundation,
-+## Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA.
-+
-+## -*- texinfo -*-
-+## @deftypefn {Function File} {} plotdecimate (@var{P})
-+## @deftypefnx {Function File} {} plotdecimate (@var{P}, @var{so})
-+## @deftypefnx {Function File} {} plotdecimate (@var{P}, @var{so}, @var{res})
-+##
-+## Optimise plot data by removing redundant points and segments
-+##
-+## The first parameter @var{P} is a two-column matrix to be plotted as X and
-+## Y coordinates. The second optional argument @var{so} disables segment
-+## optimisation when set to @var{false} (default is @var{true}). The third
-+## optional argument @var{res} is the size of the largest error on the plot:
-+## if it is a scalar, it is meant relative to the range of X and Y values
-+## (default 1e-3); if it is a 2x1 array, it contains the absolute errors for
-+## X and Y. Returns a two-column matrix containing a subset of the rows of
-+## @var{P}. A line plot of @var{P} has the same appearance as a line plot of
-+## the output, with errors smaller than @var{res}. When creating point
-+## plots, set @var{so} to @var{false}.
-+## @end deftypefn
-+
-+## Author: Francesco Potortì <Potorti at isti.cnr.it>
-+## $Revision: 2.7 $
-+## Usage: plotdecimate(P[, so[, res]])
-+## Description: Optimise plot data by removing redundant points and segments
-+
-+function C = plotdecimate (P, so, res)
-+
-+ if (!ismatrix(P) || columns(P) != 2)
-+ error("P must be a matrix with two columns");
-+ endif
-+ if (nargin < 2)
-+ so = true; # do segment optimisation
-+ endif
-+ if (nargin < 3)
-+ res = 1e-3; # default resolution is 1000 dots/axis
-+ endif
-+
-+ ## Slack: admissible error on coordinates on the output plot
-+ if (isscalar(res))
-+ if (res <= 0)
-+ error("res must be positive");
-+ endif
-+ E = range(P)' * res; # build error vector using range of data
-+ elseif (ismatrix(res))
-+ if (!all(size(res) == [2 1]) || any(res <= 0))
-+ error("res must be a 2x1 matrix with positive values");
-+ endif
-+ E = res; # take error vector as it is
-+ else
-+ error("res should be a scalar or matrix");
-+ endif
-+
-+ if (rows(P) < 3)
-+ C = P;
-+ return; # nothing to do
-+ endif
-+ P ./= repmat(E',rows(P),1); # normalize P
-+ rot = [0,-1;1,0]; # rotate a vector pi/4 anticlockwise
-+
-+ ## Iteratively remove points too near to the previous point
-+ while (1)
-+ V = [true; sumsq(diff(P),2) > 1]; # points far from the previous ones
-+ if (all(V)) break; endif
-+ V = [true; diff(V) >= 0]; # identify the sequence leaders
-+ P = P(V,:); # remove them
-+ endwhile
-+
-+ ## Remove points laying near to a segment: for each segment R->S, build a
-+ ## unitary-lenght projection vector D perpendicular to R->S, and project
-+ ## R->T over D to compute the distance ot T from R->S.
-+ if (so) # segment optimisation
-+ ## For each segment, r and s are its extremes
-+ r = 1; R = P(1,:)'; # start of segment
-+ s = 2; S = P(2,:)'; # end of the segment
-+ rebuild = true; # build first projection vector
-+
-+ for t = 3:rows(P)
-+ if (rebuild) # build projection vector
-+ D = rot*(S-R)/sqrt(sumsq(S-R)); # projection vector for distance
-+ rebuild = false; # keep current projection vector
-+ endif
-+
-+ T = P(t,:)'; # next point
-+
-+ if (abs(sum((T-R).*D)) < 1 # T is aligned
-+ && sum((T-R).*(S-R)) > 0) # going forward
-+ V(s) = false; # do not plot s
-+ else # set a new segment
-+ r = s; R = S; # new start of segment
-+ rebuild = true; # rebuild projection vector
-+ endif
-+ s = t; S = T; # new end of segment
-+ endfor
-+ endif
-+
-+ C = P(V,:) .* repmat(E',sum(V),1); # denormalize P
-+endfunction
-+
-+%!test
-+%! x = [ 0 1 2 3 4 8 8 8 8 8 9 ]';
-+%! y = [ 0 1 1 1 1 1 1 2 3 4 5 ]';
-+%!
-+%! x1 = [0 1 8 8 9]';
-+%! y1 = [0 1 1 4 5]';
-+%! # optimised for segment plot
-+%!
-+%! x2 = [ 0 1 2 3 4 8 8 8 8 9 ]';
-+%! y2 = [ 0 1 1 1 1 1 2 3 4 5 ]';
-+%! # double points removed
-+%!
-+%! P = [x,y];
-+%! # Original
-+%! P1 = [x1, y1];
-+%! # optimised segments
-+%! P2 = [x2, y2];
-+%! # double points removed
-+%!
-+%! assert(plotdecimate(P), P1);
-+%! assert(plotdecimate(P, false), P2);
diff --git a/debian/patches/series b/debian/patches/series
index 759fa40..d6a5c63 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-01_add-plotdecimate.patch
02_axis-value-labels.patch
03_psd-path.patch
set_debian_defaults
--
octave-epstk
More information about the Pkg-octave-commit
mailing list