[cvxopt] 35/64: Imported Debian patch 1.1.4-1.3

[Andreas Tille]

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

tille pushed a commit to branch master
in repository cvxopt.

commit 11da1f4884fe739683b02e9a2eb31bd2b0117f56
Author: Jean-Michel Nirgal Vourgère <jmv_deb at nirgal.com>
Date:   Wed Mar 11 23:00:40 2015 +0100

    Imported Debian patch 1.1.4-1.3
---
 debian/changelog              |  8 ++++++++
 debian/patches/glpk-4.49.diff | 36 ++++++++++++++++++++++++++++--------
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bfee9d6..f678601 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 <jmv_deb at nirgal.com>  Wed, 11 Mar 2015 23:00:40 +0100
+
 cvxopt (1.1.4-1.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/patches/glpk-4.49.diff b/debian/patches/glpk-4.49.diff
index 3367106..4320233 100644
--- a/debian/patches/glpk-4.49.diff
+++ b/debian/patches/glpk-4.49.diff
@@ -3,13 +3,16 @@ Description: Workaround for GLPK >= 4.49
  patch adds compatibility routines that were provided by the upstream author of
  GLPK.
 Author: Sébastien Villemot <sebastien at debian.org>
+Author: Jean-Michel Nirgal Vourgère <jmv_deb at nirgal.com>
 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 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  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 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +*  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 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +
 +/* 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 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +
 +#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:

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