# HG changeset patch
# User Rik <octave@nomad.inbox5.com>
# Date 1301590631 25200
# Node ID 88558b8eb8a7955eda7a5aa96661e8c84d3543ab
# Parent  422a7a7e9b6ec788f95750077287f721b89ea0df
Add deprecated entry for cquad() pointing to quadcc().
HG Enter commit message.  Lines beginning with 'HG:' are removed.

diff -r 422a7a7e9b6e -r 88558b8eb8a7 ChangeLog
--- a/ChangeLog	Thu Mar 31 09:34:26 2011 -0700
+++ b/ChangeLog	Thu Mar 31 09:57:11 2011 -0700
@@ -1,3 +1,7 @@
+2011-03-31  Rik  <octave@nomad.inbox5.com>
+
+	* NEWS: Add cquad to list of functions deprecated in 3.4
+
 2011-03-24  Jarno Rajahalme  <jarno.rajahalme@gmail.com>
 
 	* configure.ac: Try again with "-ff2c" if fortran compiler is
diff -r 422a7a7e9b6e -r 88558b8eb8a7 NEWS
--- a/NEWS	Thu Mar 31 09:34:26 2011 -0700
+++ b/NEWS	Thu Mar 31 09:57:11 2011 -0700
@@ -461,9 +461,9 @@
     be removed from Octave 3.8 (or whatever version is the second major
     release after 3.4):
 
-      autocor  cellidx   gammai     krylovb    values
-      autocov  dispatch  glpkmex    replot
-      betai    fstat     is_global  saveimage
+      autocor  cellidx   fstat    is_global  saveimage
+      autocov  cquad     gammai   krylovb    values
+      betai    dispatch  glpkmex  replot  
 
 Summary of important user-visible changes for version 3.2:
 ---------------------------------------------------------
diff -r 422a7a7e9b6e -r 88558b8eb8a7 scripts/ChangeLog
--- a/scripts/ChangeLog	Thu Mar 31 09:34:26 2011 -0700
+++ b/scripts/ChangeLog	Thu Mar 31 09:57:11 2011 -0700
@@ -1,3 +1,8 @@
+2011-03-31  Rik  <octave@nomad.inbox5.com>
+
+	* deprecated/module.mk, deprecated/cquad.m: Add deprecated entry for
+	cquad() pointing to quadcc().
+
 2011-03-31  Rik  <octave@nomad.inbox5.com>
 
 	* statistics/base/cor.m: Fix operation with only single input
diff -r 422a7a7e9b6e -r 88558b8eb8a7 scripts/deprecated/cquad.m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/deprecated/cquad.m	Thu Mar 31 09:57:11 2011 -0700
@@ -0,0 +1,39 @@
+## Copyright (C) 2011 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 3 of the License, 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, see
+## <http://www.gnu.org/licenses/>.
+
+## -*- texinfo -*-
+## @deftypefn  {Function File} {[@var{int}, @var{err}, @var{nr_points}] =} cquad (@var{f}, @var{a}, @var{b}, @var{tol})
+## @deftypefnx {Function File} {[@var{int}, @var{err}, @var{nr_points}] =} cquad (@var{f}, @var{a}, @var{b}, @var{tol}, @var{sing})
+## This function is an alias for compatibility with older versions of
+## Octave.  New programs should use @code{quadcc} instead.
+## @seealso{quadcc}
+## @end deftypefn
+
+## Deprecated in version 3.4
+
+function retval = cquad (varargin)
+  persistent warned = false;
+  if (! warned)
+    warned = true;
+    warning ("Octave:deprecated-function",
+             "cquad has been renamed to quadcc and this alias will be removed from a future version of Octave; please use quadcc instead");
+  endif
+
+  retval = quadcc (varargin{:});
+
+endfunction
diff -r 422a7a7e9b6e -r 88558b8eb8a7 scripts/deprecated/module.mk
--- a/scripts/deprecated/module.mk	Thu Mar 31 09:34:26 2011 -0700
+++ b/scripts/deprecated/module.mk	Thu Mar 31 09:57:11 2011 -0700
@@ -6,6 +6,7 @@
   deprecated/betai.m \
   deprecated/cellidx.m \
   deprecated/clg.m \
+  deprecated/cquad.m \
   deprecated/dispatch.m \
   deprecated/fstat.m \
   deprecated/gammai.m \