[Pkg-octave-devel] Re: Latest version of octave2.9-forge [attached
diffs]
Rafael Laboissiere
rafael at debian.org
Sat Jan 13 21:59:52 CET 2007
* Rafael Laboissiere <rafael at debian.org> [2007-01-13 21:25]:
> I just uploaded version 2006.07.09+dfsg1-7 to unstable. The only change
> between -6 and -7 is the removal of the texlive-base-bin build-dependency
> (see attached diff). Just for the record, I am also attaching the diff
> between -4 (the version currently in testing) and -7.
Oops, with the diffs attached this time...
--
Rafael
-------------- next part --------------
diff -Naur 2006.07.09+dfsg1-6/debian/changelog 2006.07.09+dfsg1-7/debian/changelog
--- 2006.07.09+dfsg1-6/debian/changelog 2006-12-21 23:30:35.000000000 +0100
+++ 2006.07.09+dfsg1-7/debian/changelog 2007-01-13 21:09:33.000000000 +0100
@@ -1,3 +1,12 @@
+octave2.9-forge (2006.07.09+dfsg1-7) unstable; urgency=low
+
+ * debian/control: Dropped alternative build-dependency on
+ texlive-base-bin, letting only tetex-bin. The check for texi2dvi in
+ configure fails with the former but succeeds with the later. This
+ results in the main/fixed/doc/fixed.ps being effectively built.
+
+ -- Rafael Laboissiere <rafael at debian.org> Sat, 13 Jan 2007 19:57:28 +0100
+
octave2.9-forge (2006.07.09+dfsg1-6) unstable; urgency=low
[ Thomas Weber ]
diff -Naur 2006.07.09+dfsg1-6/debian/control 2006.07.09+dfsg1-7/debian/control
--- 2006.07.09+dfsg1-6/debian/control 2006-12-21 23:30:35.000000000 +0100
+++ 2006.07.09+dfsg1-7/debian/control 2007-01-13 21:09:33.000000000 +0100
@@ -7,9 +7,8 @@
Build-Depends: debhelper (>= 5), octave2.9-headers (>= 2.9.9),
libxt-dev, gfortran, libqhull-dev, libginac-dev (>= 1.3.3-2+b1),
libgmp3-dev, libjpeg62-dev, libpng12-dev, libncurses5-dev,
- libreadline5-dev, tetex-bin | texlive-base-bin, libgsl0-dev,
- netcdfg-dev, graphicsmagick-libmagick-dev-compat, units,
- libpcre3-dev, cdbs
+ libreadline5-dev, tetex-bin, libgsl0-dev, netcdfg-dev,
+ graphicsmagick-libmagick-dev-compat, units, libpcre3-dev, cdbs
Build-Conflicts: octave2.0-headers, octave2.0, octave2.1-headers, octave2.1
Package: octave2.9-forge
-------------- next part --------------
diff -Naur 2006.07.09+dfsg1-4/debian/changelog 2006.07.09+dfsg1-7/debian/changelog
--- 2006.07.09+dfsg1-4/debian/changelog 2006-10-07 16:07:40.000000000 +0200
+++ 2006.07.09+dfsg1-7/debian/changelog 2007-01-13 21:09:33.000000000 +0100
@@ -1,3 +1,35 @@
+octave2.9-forge (2006.07.09+dfsg1-7) unstable; urgency=low
+
+ * debian/control: Dropped alternative build-dependency on
+ texlive-base-bin, letting only tetex-bin. The check for texi2dvi in
+ configure fails with the former but succeeds with the later. This
+ results in the main/fixed/doc/fixed.ps being effectively built.
+
+ -- Rafael Laboissiere <rafael at debian.org> Sat, 13 Jan 2007 19:57:28 +0100
+
+octave2.9-forge (2006.07.09+dfsg1-6) unstable; urgency=low
+
+ [ Thomas Weber ]
+ * debian/patches/50-correct-is-nan.patch: correct usage of is_nan_or_na
+ in boxplot.m (closes: #403734). Patch taken from upstreams's CVS.
+ * debian/patches/50-grayscale-image.patch: fix imread for grayscale images
+ (closes: #403864).
+ * debian/control: Add libpcre3-dev to build-dependencies and depend on
+ either tetex or texlive.
+
+ -- Rafael Laboissiere <rafael at debian.org> Thu, 21 Dec 2006 22:47:33 +0100
+
+octave2.9-forge (2006.07.09+dfsg1-5) unstable; urgency=low
+
+ * debian/patches/50-leasqr-doc.patch: Improved documentation for leasqr.
+ Thanks to Francesco Potort?? for the patch, which has also been applied
+ upstream (closes: #393495).
+ * debian/patches/50-imagepath.patch: In imread.m, use IMAGE_PATH instead
+ of IMAGEPATH, which is the right name of the internal variable in
+ Octave 2.9 (closes: #403653, thanks to Tobias Eberle for the heads up)
+
+ -- Rafael Laboissiere <rafael at debian.org> Mon, 18 Dec 2006 23:11:24 +0100
+
octave2.9-forge (2006.07.09+dfsg1-4) unstable; urgency=low
* Rebuilt for Octave 2.9.8 since the API number bumped from 21 to 22.
diff -Naur 2006.07.09+dfsg1-4/debian/control 2006.07.09+dfsg1-7/debian/control
--- 2006.07.09+dfsg1-4/debian/control 2006-10-07 16:07:40.000000000 +0200
+++ 2006.07.09+dfsg1-7/debian/control 2007-01-13 21:09:33.000000000 +0100
@@ -8,7 +8,7 @@
libxt-dev, gfortran, libqhull-dev, libginac-dev (>= 1.3.3-2+b1),
libgmp3-dev, libjpeg62-dev, libpng12-dev, libncurses5-dev,
libreadline5-dev, tetex-bin, libgsl0-dev, netcdfg-dev,
- graphicsmagick-libmagick-dev-compat, units, cdbs
+ graphicsmagick-libmagick-dev-compat, units, libpcre3-dev, cdbs
Build-Conflicts: octave2.0-headers, octave2.0, octave2.1-headers, octave2.1
Package: octave2.9-forge
diff -Naur 2006.07.09+dfsg1-4/debian/patches/50-correct-is-nan.patch 2006.07.09+dfsg1-7/debian/patches/50-correct-is-nan.patch
--- 2006.07.09+dfsg1-4/debian/patches/50-correct-is-nan.patch 1970-01-01 01:00:00.000000000 +0100
+++ 2006.07.09+dfsg1-7/debian/patches/50-correct-is-nan.patch 2007-01-13 21:09:33.000000000 +0100
@@ -0,0 +1,25 @@
+diff -Nur octave2.9-forge-2006.07.09+dfsg1/main/statistics/boxplot.m octave2.9-forge-2006.07.09+dfsg1.new/main/statistics/boxplot.m
+--- octave2.9-forge-2006.07.09+dfsg1/main/statistics/boxplot.m 2003-02-12 20:58:33.000000000 +0100
++++ octave2.9-forge-2006.07.09+dfsg1.new/main/statistics/boxplot.m 2006-12-19 15:26:21.000000000 +0100
+@@ -65,6 +65,12 @@
+ ## Version: 1.4
+ ## Created: 6 January 2002
+
++## Version: 1.4.1
++## Author: Alberto Pose <apose at alu.itba.edu.ar>
++## Updated: 3 September 2006
++## - Replaced deprecated is_nan_or_na(X) with (isnan(X) | isna(X))
++## (now works with Octave 2.9.7 and foward)
++
+ function s = boxplot (data,notched,symbol,vertical,maxwhisker)
+
+ ## assign parameter defaults
+@@ -111,7 +117,7 @@
+ col = data(:,i);
+ endif
+ ## Skip missing data
+- col(is_nan_or_na (col)) = [];
++ col(isnan(col) | isna (col)) = [];
+ ## Remember the data length
+ nd = length(col);
+ box(i) = nd;
diff -Naur 2006.07.09+dfsg1-4/debian/patches/50-grayscale-image.patch 2006.07.09+dfsg1-7/debian/patches/50-grayscale-image.patch
--- 2006.07.09+dfsg1-4/debian/patches/50-grayscale-image.patch 1970-01-01 01:00:00.000000000 +0100
+++ 2006.07.09+dfsg1-7/debian/patches/50-grayscale-image.patch 2007-01-13 21:09:33.000000000 +0100
@@ -0,0 +1,31 @@
+diff -Nur octave2.9-forge-2006.07.09+dfsg1/main/image/imread.m octave2.9-forge-2006.07.09+dfsg1.new/main/image/imread.m
+--- octave2.9-forge-2006.07.09+dfsg1/main/image/imread.m 2006-05-12 15:25:45.000000000 +0200
++++ octave2.9-forge-2006.07.09+dfsg1.new/main/image/imread.m 2006-12-20 15:49:22.000000000 +0100
+@@ -28,6 +28,11 @@
+ ##
+ ## Modified: Stefan van der Walt <stefan at sun.ac.za>
+ ## Date: 24 January 2005
++##
++## Modified: Thomas Weber <thomas.weber.mail at gmail.com>
++## Date: 20 December 2006
++## Change parsing of imagemagick's output to get the 'color' depth for grayscale
++## images
+
+ function varargout = imread(filename, varargin)
+ if (nargin != 1)
+@@ -64,12 +69,12 @@
+ break
+ endif
+
+- [sys, ident] = system(sprintf('identify -verbose %s | grep -e "Red: " -e Type',
+- fn));
++ [sys, ident] = system(sprintf('identify -verbose %s | grep -e "bits" -e Type',
++ fn))
+ if (sys != 0)
+ error("imread: error running ImageMagick's 'identify' on %s", fn)
+ endif
+- depth = re_grab("Red: ([[:digit:]]{1,2})", ident);
++ depth = re_grab("([[:digit:]]{1,2})-bits", ident)
+ imtype = re_grab("Type: ([[:alpha:]]*)", ident);
+
+ depth = str2num(depth);
diff -Naur 2006.07.09+dfsg1-4/debian/patches/50-imagepath.patch 2006.07.09+dfsg1-7/debian/patches/50-imagepath.patch
--- 2006.07.09+dfsg1-4/debian/patches/50-imagepath.patch 1970-01-01 01:00:00.000000000 +0100
+++ 2006.07.09+dfsg1-7/debian/patches/50-imagepath.patch 2007-01-13 21:09:33.000000000 +0100
@@ -0,0 +1,12 @@
+diff -Nur octave2.9-forge-2006.07.09+dfsg1/main/image/imread.m octave2.9-forge-2006.07.09+dfsg1.new/main/image/imread.m
+--- octave2.9-forge-2006.07.09+dfsg1/main/image/imread.m 2006-05-12 15:25:45.000000000 +0200
++++ octave2.9-forge-2006.07.09+dfsg1.new/main/image/imread.m 2006-12-18 23:00:42.000000000 +0100
+@@ -38,7 +38,7 @@
+ error("imread: filename must be a string")
+ endif
+
+- fn = file_in_path(IMAGEPATH, filename);
++ fn = file_in_path(IMAGE_PATH, filename);
+ if isempty(fn)
+ error("imread: cannot find %s", filename);
+ endif
diff -Naur 2006.07.09+dfsg1-4/debian/patches/50-leasqr-doc.patch 2006.07.09+dfsg1-7/debian/patches/50-leasqr-doc.patch
--- 2006.07.09+dfsg1-4/debian/patches/50-leasqr-doc.patch 1970-01-01 01:00:00.000000000 +0100
+++ 2006.07.09+dfsg1-7/debian/patches/50-leasqr-doc.patch 2007-01-13 21:09:33.000000000 +0100
@@ -0,0 +1,87 @@
+*** octave2.9-forge-2006.07.09+dfsg1.orig/main/optim/leasqr.m 2006-10-22 11:06:41.000000000 +0200
+--- octave2.9-forge-2006.07.09+dfsg1/main/main/optim/leasqr.m 2006-10-22 11:29:12.000000000 +0200
+@@ -22,24 +22,30 @@
+ % Levenberg-Marquardt nonlinear regression of f(x,p) to y(x).
+ %
+ % Version 3.beta
+-% {}= optional parameters
+-% x=vec or mat of indep variables, 1 row/observation: x=[x0 x1....xm]
+-% y=vec of obs values, same no. of rows as x.
+-% wt=vec(dim=length(x)) of statistical weights. These should be set
+-% to be proportional to (sqrt of var(y))^-1; (That is, the covariance
+-% matrix of the data is assumed to be proportional to diagonal with diagonal
+-% equal to (wt.^2)^-1. The constant of proportionality will be estimated.),
+-% default=ones(length(y),1).
+-% pin=vector of initial parameters to be adjusted by leasqr.
+-% dp=fractional incr of p for numerical partials,default= .001*ones(size(pin))
+-% dp(j)>0 means central differences.
+-% dp(j)<0 means one-sided differences.
+-% Note: dp(j)=0 holds p(j) fixed i.e. leasqr wont change initial guess: pin(j)
+-% F=name of function in quotes,of the form y=f(x,p)
+-% dFdp=name of partials M-file in quotes default is prt=dfdp(x,f,p,dp,F)
+-% stol=scalar tolerances on fractional improvement in ss,default stol=.0001
+-% niter=scalar max no. of iterations, default = 20
+-% options=matrix of n rows (same number of rows as pin) containing
++% Optional parameters are in braces {}.
++% x = column vector or matrix of independent variables, 1 row per
++% observation: x = [x0 x1....xm].
++% y = column vector of observed values, same number of rows as x.
++% wt = column vector (dim=length(x)) of statistical weights. These
++% should be set to be proportional to (sqrt of var(y))^-1; (That is,
++% the covariance matrix of the data is assumed to be proportional to
++% diagonal with diagonal equal to (wt.^2)^-1. The constant of
++% proportionality will be estimated.); default = ones(length(y),1).
++% pin = column vec of initial parameters to be adjusted by leasqr.
++% dp = fractional increment of p for numerical partial derivatives;
++% default = .001*ones(size(pin))
++% dp(j) > 0 means central differences on j-th parameter p(j).
++% dp(j) < 0 means one-sided differences on j-th parameter p(j).
++% dp(j) = 0 holds p(j) fixed i.e. leasqr wont change initial guess: pin(j)
++% F = name of function in quotes; the function shall be of the form y=f(x,p),
++% with y, x, p of the form y, x, pin as described above.
++% dFdp = name of partial derivative function in quotes; default is "dfdp", a
++% slow but general partial derivatives function; the function shall be
++% of the form prt=dfdp(x,f,p,dp,F) (see dfdp.m).
++% stol = scalar tolerance on fractional improvement in scalar sum of
++% squares = sum((wt.*(y-f))^2); default stol = .0001;
++% niter = scalar maximum number of iterations; default = 20;
++% options = matrix of n rows (same number of rows as pin) containing
+ % column 1: desired fractional precision in parameter estimates.
+ % Iterations are terminated if change in parameter vector (chg) on two
+ % consecutive iterations is less than their corresponding elements
+@@ -52,16 +58,16 @@
+ % default = Inf*ones().
+ %
+ % OUTPUT VARIABLES
+-% f=vec function values computed in function func.
+-% p=vec trial or final parameters. i.e, the solution.
+-% kvg=scalar: =1 if convergence, =0 otherwise.
+-% iter=scalar no. of interations used.
+-% corp= correlation matrix for parameters
+-% covp= covariance matrix of the parameters
+-% covr = diag(covariance matrix of the residuals)
+-% stdresid= standardized residuals
+-% Z= matrix that defines confidence region
+-% r2= coefficient of multiple determination
++% f = column vector of values computed: f = F(x,p).
++% p = column vector trial or final parameters. i.e, the solution.
++% kvg = scalar: = 1 if convergence, = 0 otherwise.
++% iter = scalar number of iterations used.
++% corp = correlation matrix for parameters.
++% covp = covariance matrix of the parameters.
++% covr = diag(covariance matrix of the residuals).
++% stdresid = standardized residuals.
++% Z = matrix that defines confidence region (see comments in the source).
++% r2 = coefficient of multiple determination.
+ %
+ % All Zero guesses not acceptable
+
+@@ -113,7 +119,7 @@
+ % 8) Change to more efficent algorithm of Bard for selecting epsL.
+ % 9) Tighten up memory usage by making use of sparse matrices (if
+ % MATLAB version >= 4.0) in computation of covp, corp, stdresid.
+-% Modified by Francesco Potorti
++% Modified by Francesco Potort?
+ % for use in Octave
+ %
+ % References:
More information about the Pkg-octave-devel
mailing list