# HG changeset patch
# User Rik <octave@nomad.inbox5.com>
# Date 1296402756 28800
# Node ID abcd61f965e59acbd328ec59b68870b1e6722b63
# Parent  677be77b684bd35e6da38ea7c4006df94cf872c7
Deprecate glpkmex function and remove from documentation.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-30  Rik  <octave@nomad.inbox5.com>
+
+	* NEWS: Deprecate glpkmex function.
+	
 2011-01-30  John W. Eaton  <jwe@octave.org>
 
 	* acinclude.m4 (OCTAVE_PROG_GHOSTSCRIPT): Update warning message.
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -409,9 +409,9 @@
     be removed from Octave 3.8 (or whatever version is the second major
     release after 3.4):
 
-      autocor  cellidx   gammai     replot
-      autocov  dispatch  is_global  saveimage 
-      betai    fstat     krylovb    values
+      autocor  cellidx   gammai     krylovb    values
+      autocov  dispatch  glpkmex    replot
+      betai    fstat     is_global  saveimage
 
   * For compatibility with Matlab, mu2lin (x) is now equivalent to
     mu2lin (x, 0).
diff --git a/doc/ChangeLog b/doc/ChangeLog
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-30  Rik  <octave@nomad.inbox5.com>
+
+	* interpreter/optim.txi: Deprecate glpkmex function and remove
+	from documentation.
+
 2011-01-30  John W. Eaton  <jwe@octave.org>
 
 	* interpreter/install.txi (Compiling Octave with 64-bit	Indexing):
diff --git a/doc/interpreter/optim.txi b/doc/interpreter/optim.txi
--- a/doc/interpreter/optim.txi
+++ b/doc/interpreter/optim.txi
@@ -70,8 +70,6 @@
 
 @DOCSTRING(glpk)
 
-@DOCSTRING(glpkmex)
-
 @node Quadratic Programming
 @section Quadratic Programming
 
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-30  Rik  <octave@nomad.inbox5.com>
+
+	* deprecated/module.mk, optimization/module.mk: Deprecate glpkmex
+	function.
+
 2011-01-30  John W. Eaton  <jwe@octave.org>
 
 	* plot/__gnuplot_drawnow__.m: Rename from gnuplot_drawnow.m
diff --git a/scripts/optimization/glpkmex.m b/scripts/deprecated/glpkmex.m
rename from scripts/optimization/glpkmex.m
rename to scripts/deprecated/glpkmex.m
--- a/scripts/optimization/glpkmex.m
+++ b/scripts/deprecated/glpkmex.m
@@ -26,6 +26,13 @@
 
 function [xopt, fopt, status, extra] = glpkmex (varargin)
 
+  persistent warned = false;
+  if (! warned)
+    warned = true;
+    warning ("Octave:deprecated-function",
+             "glpkmex is obsolete and will be removed from a future version of Octave; please use glpk instead");
+  endif
+  
   ## If there is no input output the version and syntax
   if (nargin < 4 || nargin > 11)
     print_usage ();
diff --git a/scripts/deprecated/module.mk b/scripts/deprecated/module.mk
--- a/scripts/deprecated/module.mk
+++ b/scripts/deprecated/module.mk
@@ -12,6 +12,7 @@
   deprecated/dmult.m \
   deprecated/fstat.m \
   deprecated/gammai.m \
+  deprecated/glpkmex.m \
   deprecated/intwarning.m \
   deprecated/iscommand.m \
   deprecated/is_global.m \
diff --git a/scripts/optimization/module.mk b/scripts/optimization/module.mk
--- a/scripts/optimization/module.mk
+++ b/scripts/optimization/module.mk
@@ -10,7 +10,6 @@
   optimization/fsolve.m \
   optimization/fzero.m \
   optimization/glpk.m \
-  optimization/glpkmex.m \
   optimization/lsqnonneg.m \
   optimization/optimget.m \
   optimization/optimset.m \