[SCM] glpk packaging branch, master, updated. upstream/4.51-14-g857c570

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit ed0cafe8c4bbee114f9c4a4f7069618413260450
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Tue Jun 25 20:16:14 2013 +0200

    Update manpage of glpsol

diff --git a/debian/changelog b/debian/changelog
index b31e9fd..f2250d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ glpk (4.51-1) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.9.4, no changes needed
   * Fix description of glpk-utils: example program "tspsol" has been
     removed upstream (Closes: #698319)
+  * Update manpage of glpsol
 
  -- Sébastien Villemot <sebastien at debian.org>  Wed, 19 Jun 2013 18:15:36 +0200
 
diff --git a/debian/glpsol.1 b/debian/glpsol.1
index c6e5c44..e3cf34e 100644
--- a/debian/glpsol.1
+++ b/debian/glpsol.1
@@ -1,6 +1,6 @@
-.TH GLPSOL "1" "March 2010" "GLPSOL: GLPK LP/MIP Solver, v4.43" "User Commands"
+.TH glpsol "1" "June 2013" "glpsol: GLPK LP/MIP Solver, v4.51" "User Commands"
 .SH NAME
-GLPSOL: \- manual page for GLPSOL: GLPK LP/MIP Solver, v4.43
+glpsol \- large-scale linear and mixed integer programming solver
 .SH SYNOPSIS
 .B glpsol
 [\fIoptions\fR...] \fIfilename\fR
@@ -46,6 +46,9 @@ read min\-cost flow problem in DIMACS format
 \fB\-\-maxflow\fR
 read maximum flow problem in DIMACS format
 .TP
+\fB\-\-cnf\fR
+read CNF\-SAT problem in DIMACS format
+.TP
 \fB\-\-simplex\fR
 use simplex method (default)
 .TP
@@ -102,6 +105,9 @@ write problem to filename in CPLEX LP format
 \fB\-\-wglp\fR filename
 write problem to filename in GLPK format
 .TP
+\fB\-\-wcnf\fR filename
+write problem to filename in DIMACS CNF\-SAT format
+.TP
 \fB\-\-log\fR filename
 write copy of terminal output to filename
 .TP
@@ -229,6 +235,9 @@ replace general integer variables by binary ones
 \fB\-\-fpump\fR
 apply feasibility pump heuristic
 .TP
+\fB\-\-proxy\fR
+apply proximity search heuristic
+.TP
 \fB\-\-gomory\fR
 generate Gomory's mixed integer cuts
 .TP
@@ -246,16 +255,28 @@ generate all cuts above
 .TP
 \fB\-\-mipgap\fR tol
 set relative mip gap tolerance to tol
+.TP
+\fB\-\-minisat\fR
+translate integer feasibility problem to CNF\-SAT
+and solve it with MiniSat solver
+.TP
+\fB\-\-objbnd\fR bound
+add inequality obj <= bound (minimization) or
+obj >= bound (maximization) to integer feasibility
+problem (assumes \fB\-\-minisat\fR)
 .SH "SEE ALSO"
 .TP
 For description of the MPS and CPLEX LP formats see the Reference Manual at /usr/share/doc/glpk-doc/glpk.pdf
 .PP
 For description of the modeling language see "GLPK: Modeling Language
 GNU MathProg" at /usr/share/doc/glpk-doc/gmpl.pdf
+.PP
+Please report bugs to <bug\-glpk at gnu.org>.
 .SH COPYRIGHT
 Copyright \(co 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-2009, 2010 Andrew Makhorin, Department for Applied Informatics, Moscow
-Aviation Institute, Moscow, Russia. All rights reserved.
+2009, 2010, 2011, 2013 Andrew Makhorin, Department for Applied
+Informatics, Moscow Aviation Institute, Moscow, Russia.
+E\-mail: <mao at gnu.org>.
 .PP
 This program has ABSOLUTELY NO WARRANTY.
 .PP

-- 
glpk packaging