[Pkg-octave-commit] [octave-optim] 02/02: d/p/texinfo5.patch: Drop patch (applied upstream)

[Rafael Laboissière]

This is an automated email from the git hooks/post-receive script.

rlaboiss-guest pushed a commit to branch master
in repository octave-optim.

commit 361349b3d6098cd414673112eb95f2c6644503f3
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sun Mar 22 09:42:47 2015 -0300

    d/p/texinfo5.patch: Drop patch (applied upstream)
---
 debian/patches/series         |  1 -
 debian/patches/texinfo5.patch | 77 -------------------------------------------
 2 files changed, 78 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 04656c8..245eb10 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 autoload-yes.patch
-texinfo5.patch
 add-info-dir.patch
 info-file-path.patch
diff --git a/debian/patches/texinfo5.patch b/debian/patches/texinfo5.patch
deleted file mode 100644
index cfc0e14..0000000
--- a/debian/patches/texinfo5.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Description: Fix build errors with Texinfo 5
-Author: Sébastien Villemot <sebastien at debian.org>
-Bug: https://savannah.gnu.org/bugs/index.php?42928
-Last-Update: 2014-08-06
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/inst/wpolyfit.m
-+++ b/inst/wpolyfit.m
-@@ -65,16 +65,18 @@
- ## @end example
- ## but the high degree of covariance amongst them makes this a questionable
- ## operation.
-+## @end deftypefn
- ##
--## @deftypefnx {Function File} {[@var{p}, @var{s}, @var{mu}] =} wpolyfit (...)
-+## @deftypefn {Function File} {[@var{p}, @var{s}, @var{mu}] =} wpolyfit (...)
- ##
- ## If an additional output @code{mu = [mean(x),std(x)]} is requested then 
- ## the @var{x} values are centered and normalized prior to computing the fit.
- ## This will give more stable numerical results.  To compute a predicted 
- ## @var{y} from the returned model use
- ## @code{y = polyval(p, (x-mu(1))/mu(2)}
-+## @end deftypefn
- ##
--## @deftypefnx {Function File} {} wpolyfit (...)
-+## @deftypefn {Function File} {} wpolyfit (...)
- ##
- ## If no output arguments are requested, then wpolyfit plots the data,
- ## the fitted line and polynomials defining the standard error range.
-@@ -86,8 +88,9 @@
- ## y = polyval([2,3,1],x) + dy.*randn(size(x));
- ## wpolyfit(x,y,dy,2);
- ## @end example
-+## @end deftypefn
- ##
--## @deftypefnx {Function File} {} wpolyfit (..., 'origin')
-+## @deftypefn {Function File} {} wpolyfit (..., 'origin')
- ##
- ## If 'origin' is specified, then the fitted polynomial will go through
- ## the origin.  This is generally ill-advised.  Use with caution.
---- a/doc/optim.txi
-+++ b/doc/optim.txi
-@@ -172,8 +172,9 @@ computed and can be set to zero, @code{d
- name, @code{plabels}: 1-dimensional cell-array of column-cell-arrays,
- each column with labels for all parameters; the first column contains
- the numerical indices of the parameters; the second and third columns,
--present for structure based parameter handling, @mysee @ref{Parameter
--structures}, contain the names of the parameters and the subindices of
-+present for structure based parameter handling, @mysee
-+ at ref{Parameter structures},
-+contain the names of the parameters and the subindices of
- the parameters, @mysee @ref{Non-scalar parameters}, respectively.  The default
- gradient function will call the objective function with the second
- argument set with fields @code{f}: as the @code{f} passed to the
-@@ -606,8 +607,9 @@ computed and can be set to zero, @code{d
- name, @code{plabels}: 1-dimensional cell-array of column-cell-arrays,
- each column with labels for all parameters; the first column contains
- the numerical indices of the parameters; the second and third columns,
--present for structure based parameter handling, @mysee @ref{Parameter
--structures}, contain the names of the parameters and the subindices of
-+present for structure based parameter handling, @mysee
-+ at ref{Parameter structures},
-+contain the names of the parameters and the subindices of
- the parameters, @mysee @ref{Non-scalar parameters}, respectively.  The default
- jacobian function will call the model function with the second argument
- set with fields @code{f}: as the @code{f} passed to the jacobian
-@@ -664,8 +666,8 @@ instead of @code{nonlin_curvefit}.
- 
- @c replace the cut out text
- Also, if the setting @code{user_interaction} is given, additional
--information is passed to these functions, @mysee @ref{Common optimization
--options}.
-+information is passed to these functions, @mysee
-+ at ref{Common optimization options}.
- 
- @c ------------------------------------------------------------------
- 

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-optim.git