Control: tags -1 + pending I have uploaded to DELAYED/5 a NMU prepared by Jean-Michel Vourgère. The debdiff is attached.
Cheers, -- .''`. Sébastien Villemot : :' : Debian Developer `. `' http://sebastien.villemot.name `- GPG Key: 4096R/381A7594
diff -Nru cvxopt-1.1.4/debian/changelog cvxopt-1.1.4/debian/changelog --- cvxopt-1.1.4/debian/changelog 2013-12-06 17:38:32.000000000 +0100 +++ cvxopt-1.1.4/debian/changelog 2015-03-15 11:54:07.000000000 +0100 @@ -1,3 +1,11 @@ +cvxopt (1.1.4-1.3) unstable; urgency=medium + + * Non-maintainer upload. + * Fix glpk-4.49.diff: Link the lpx emulation file, fix the #if activation + test. This fixes "undefined symbol: lpx_create_prob" bugs. (Closes: #780251) + + -- Jean-Michel Nirgal Vourgère <[email protected]> Wed, 11 Mar 2015 23:00:40 +0100 + cvxopt (1.1.4-1.2) unstable; urgency=medium * Non-maintainer upload. diff -Nru cvxopt-1.1.4/debian/patches/glpk-4.49.diff cvxopt-1.1.4/debian/patches/glpk-4.49.diff --- cvxopt-1.1.4/debian/patches/glpk-4.49.diff 2013-12-06 17:39:16.000000000 +0100 +++ cvxopt-1.1.4/debian/patches/glpk-4.49.diff 2015-03-14 21:15:54.000000000 +0100 @@ -3,13 +3,16 @@ patch adds compatibility routines that were provided by the upstream author of GLPK. Author: Sébastien Villemot <[email protected]> +Author: Jean-Michel Nirgal Vourgère <[email protected]> Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=714368 -Forwarded: no -Last-Update: 2013-08-15 +Forwarded: not-needed +Last-Update: 2015-03-11 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/src/C/glpk.c -+++ b/src/C/glpk.c +Index: cvxopt-1.1.4/src/C/glpk.c +=================================================================== +--- cvxopt-1.1.4.orig/src/C/glpk.c ++++ cvxopt-1.1.4/src/C/glpk.c @@ -20,7 +20,7 @@ #include "cvxopt.h" @@ -19,8 +22,10 @@ PyDoc_STRVAR(glpk__doc__, "Interface to the simplex and mixed integer LP algorithms in GLPK.\n\n" +Index: cvxopt-1.1.4/src/C/lpx.c +=================================================================== --- /dev/null -+++ b/src/C/lpx.c ++++ cvxopt-1.1.4/src/C/lpx.c @@ -0,0 +1,1516 @@ +/* lpx.c (old GLPK API) */ + @@ -35,12 +40,12 @@ +* Please note that you may mix calls to old and new GLPK API routines +* (except calls to glp_create_prob and glp_delete_prob). */ + -+#if (GLP_VERSION_MAJOR == 4 && GLP_MINOR_VERSION >= 49) || GLP_VERSION_MAJOR > 4 -+ +#include <float.h> +#include <limits.h> +#include "lpx.h" + ++#if (GLP_MAJOR_VERSION == 4 && GLP_MINOR_VERSION >= 49) || GLP_MAJOR_VERSION > 4 ++ +#define xassert glp_assert +#define xerror glp_error + @@ -1538,8 +1543,10 @@ + +/* eof */ + +Index: cvxopt-1.1.4/src/C/lpx.h +=================================================================== --- /dev/null -+++ b/src/C/lpx.h ++++ cvxopt-1.1.4/src/C/lpx.h @@ -0,0 +1,568 @@ +/* lpx.h (old GLPK API) */ + @@ -2109,3 +2116,16 @@ + +#endif +/* eof */ +Index: cvxopt-1.1.4/src/setup.py +=================================================================== +--- cvxopt-1.1.4.orig/src/setup.py ++++ cvxopt-1.1.4/src/setup.py +@@ -63,7 +63,7 @@ if BUILD_GLPK: + glpk = Extension('glpk', libraries = ['glpk'], + include_dirs = [ GLPK_INC_DIR ], + library_dirs = [ GLPK_LIB_DIR ], +- sources = ['C/glpk.c'] ) ++ sources = ['C/glpk.c', 'C/lpx.c'] ) + extmods += [glpk]; + + if BUILD_DSDP:
signature.asc
Description: This is a digitally signed message part
