[cvxopt] 01/01: d/p/glpk-4.49.diff: remove the compatibility layer for lpx_main(), it is not needed and uses a missing symbol. (Closes: #859579)

[Sébastien Villemot]

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

sebastien pushed a commit to branch stretch
in repository cvxopt.

commit 6c6d115e1c8faa8034c3b27f5c62e4e42a2b6ae5
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Mon Aug 21 17:01:09 2017 +0200

    d/p/glpk-4.49.diff: remove the compatibility layer for lpx_main(), it is not needed and uses a missing symbol. (Closes: #859579)
---
 debian/changelog              |  8 ++++++++
 debian/patches/glpk-4.49.diff | 12 ++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e4ca114..cf68afb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+cvxopt (1.1.4-1.5+deb9u1) stretch; urgency=medium
+
+  * Team upload.
+  * d/p/glpk-4.49.diff: remove the compatibility layer for lpx_main(), it is
+    not needed and uses a missing symbol. (Closes: #859579)
+
+ -- Sébastien Villemot <sebastien at debian.org>  Mon, 21 Aug 2017 16:55:52 +0200
+
 cvxopt (1.1.4-1.5) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/patches/glpk-4.49.diff b/debian/patches/glpk-4.49.diff
index 4320233..6e04bd3 100644
--- a/debian/patches/glpk-4.49.diff
+++ b/debian/patches/glpk-4.49.diff
@@ -26,7 +26,7 @@ Index: cvxopt-1.1.4/src/C/lpx.c
 ===================================================================
 --- /dev/null
 +++ cvxopt-1.1.4/src/C/lpx.c
-@@ -0,0 +1,1516 @@
+@@ -0,0 +1,1511 @@
 +/* lpx.c (old GLPK API) */
 +
 +/* Written by Andrew Makhorin <mao at gnu.org>, August 2013. */
@@ -1534,11 +1534,6 @@ Index: cvxopt-1.1.4/src/C/lpx.c
 +      return glp_bf_exists(lp);
 +}
 +
-+int lpx_main(int argc, const char *argv[])
-+{     /* stand-alone LP/MIP solver */
-+      return glp_main(argc, argv);
-+}
-+
 +#endif
 +
 +/* eof */
@@ -1547,7 +1542,7 @@ Index: cvxopt-1.1.4/src/C/lpx.h
 ===================================================================
 --- /dev/null
 +++ cvxopt-1.1.4/src/C/lpx.h
-@@ -0,0 +1,568 @@
+@@ -0,0 +1,565 @@
 +/* lpx.h (old GLPK API) */
 +
 +/* Written by Andrew Makhorin <mao at gnu.org>, August 2013. */
@@ -2105,9 +2100,6 @@ Index: cvxopt-1.1.4/src/C/lpx.h
 +int lpx_is_b_avail(LPX *lp);
 +/* check if LP basis is available */
 +
-+int lpx_main(int argc, const char *argv[]);
-+/* stand-alone LP/MIP solver */
-+
 +#ifdef __cplusplus
 +}
 +#endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cvxopt.git