[cvxopt] 34/64: Imported Debian patch 1.1.4-1.2

[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 473d229edaaa4fa0ea119034b28ccc5202d59775
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Fri Dec 6 17:38:28 2013 +0100

    Imported Debian patch 1.1.4-1.2
---
 debian/changelog              | 8 ++++++++
 debian/patches/glpk-4.49.diff | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 64877fc..bfee9d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+cvxopt (1.1.4-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * glpk-4.49.diff: fix GLPK version detection (the wrong macro was used).
+    (Closes: #731445)
+
+ -- Sébastien Villemot <sebastien at debian.org>  Fri, 06 Dec 2013 17:38:28 +0100
+
 cvxopt (1.1.4-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/patches/glpk-4.49.diff b/debian/patches/glpk-4.49.diff
index f90e134..3367106 100644
--- a/debian/patches/glpk-4.49.diff
+++ b/debian/patches/glpk-4.49.diff
@@ -1550,7 +1550,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +
 +#include <glpk.h>
 +
-+#if (GLP_VERSION_MAJOR == 4 && GLP_MINOR_VERSION >= 49) || GLP_VERSION_MAJOR > 4
++#if (GLP_MAJOR_VERSION == 4 && GLP_MINOR_VERSION >= 49) || GLP_MAJOR_VERSION > 4
 +
 +#ifdef __cplusplus
 +extern "C" {

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