[cvxopt] 44/64: Adapt patches to new upstream version
Andreas Tille
tille at debian.org
Wed Jul 20 11:23:54 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository cvxopt.
commit 8a3cd95ab2f2a83640667986db988705b028046a
Author: Andreas Tille <tille at debian.org>
Date: Wed Jul 20 09:20:21 2016 +0200
Adapt patches to new upstream version
---
debian/patches/glpk-4.49.diff | 36 +++++++----------
debian/patches/series | 1 +
debian/patches/setup.diff | 47 +++++++++-------------
.../use_debian_packaged_libsuitesparse.diff | 24 +++++++++++
4 files changed, 58 insertions(+), 50 deletions(-)
diff --git a/debian/patches/glpk-4.49.diff b/debian/patches/glpk-4.49.diff
index 4320233..6bee1b9 100644
--- a/debian/patches/glpk-4.49.diff
+++ b/debian/patches/glpk-4.49.diff
@@ -9,23 +9,19 @@ Forwarded: not-needed
Last-Update: 2015-03-11
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-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 @@
+--- a/src/C/glpk.c
++++ b/src/C/glpk.c
+@@ -21,7 +21,7 @@
#include "cvxopt.h"
#include "misc.h"
--#include "glpk.h"
-+#include "lpx.h"
+-#include <glpk.h>
++#include <lpx.h>
+ #include <float.h>
+ #include <limits.h>
- 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
-+++ cvxopt-1.1.4/src/C/lpx.c
++++ b/src/C/lpx.c
@@ -0,0 +1,1516 @@
+/* lpx.c (old GLPK API) */
+
@@ -1543,10 +1539,8 @@ Index: cvxopt-1.1.4/src/C/lpx.c
+
+/* eof */
+
-Index: cvxopt-1.1.4/src/C/lpx.h
-===================================================================
--- /dev/null
-+++ cvxopt-1.1.4/src/C/lpx.h
++++ b/src/C/lpx.h
@@ -0,0 +1,568 @@
+/* lpx.h (old GLPK API) */
+
@@ -2116,16 +2110,14 @@ Index: cvxopt-1.1.4/src/C/lpx.h
+
+#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:
+--- a/setup.py
++++ b/setup.py
+@@ -117,7 +117,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'] )
+- sources = ['src/C/glpk.c'] )
++ sources = ['src/C/glpk.c', 'C/lpx.c'] )
extmods += [glpk];
if BUILD_DSDP:
diff --git a/debian/patches/series b/debian/patches/series
index b26eb78..9b165ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
setup.diff
+use_debian_packaged_libsuitesparse.diff
glpk-4.49.diff
diff --git a/debian/patches/setup.diff b/debian/patches/setup.diff
index 4d68652..7c53201 100644
--- a/debian/patches/setup.diff
+++ b/debian/patches/setup.diff
@@ -1,13 +1,11 @@
-Index: cvxopt-1.1.2/src/setup.py
-===================================================================
---- cvxopt-1.1.2.orig/src/setup.py 2009-11-28 06:37:29.000000000 +0100
-+++ cvxopt-1.1.2/src/setup.py 2009-12-20 07:45:27.000000000 +0100
-@@ -2,11 +2,11 @@
- from glob import glob
-
- # directory containing libblas and liblapack
--ATLAS_LIB_DIR = '/usr/lib'
-+ATLAS_LIB_DIR = '/usr/lib/atlas'
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Wed, 20 Jul 2016 08:33:05 +0200
+Description: Take over old patch to new upstream version.
+ Include all optional libraries
+
+--- a/setup.py
++++ b/setup.py
+@@ -19,7 +19,7 @@ BLAS_NOUNDERSCORES = False
# Set to 1 if you are using the random number generators in the GNU
# Scientific Library.
@@ -15,27 +13,27 @@ Index: cvxopt-1.1.2/src/setup.py
+BUILD_GSL = 1
# Directory containing libgsl (used only when BUILD_GSL = 1).
- GSL_LIB_DIR = '/usr/lib'
-@@ -15,7 +15,7 @@
- GSL_INC_DIR = '/usr/include/gsl'
+ GSL_LIB_DIR = '/usr/lib'
+@@ -28,7 +28,7 @@ GSL_LIB_DIR = '/usr/lib'
+ GSL_INC_DIR = '/usr/include/gsl'
# Set to 1 if you are installing the fftw module.
--BUILD_FFTW = 0
+-BUILD_FFTW = 0
+BUILD_FFTW = 1
# Directory containing libfftw3 (used only when BUILD_FFTW = 1).
- FFTW_LIB_DIR = '/usr/lib'
-@@ -24,7 +24,7 @@
- FFTW_INC_DIR = '/usr/include'
+ FFTW_LIB_DIR = '/usr/lib'
+@@ -37,7 +37,7 @@ FFTW_LIB_DIR = '/usr/lib'
+ FFTW_INC_DIR = '/usr/include'
# Set to 1 if you are installing the glpk module.
--BUILD_GLPK = 0
+-BUILD_GLPK = 0
+BUILD_GLPK = 1
# Directory containing libglpk (used only when BUILD_GLPK = 1).
- GLPK_LIB_DIR = '/usr/lib'
-@@ -33,13 +33,13 @@
- GLPK_INC_DIR = '/usr/include'
+ GLPK_LIB_DIR = '/usr/lib'
+@@ -46,7 +46,7 @@ GLPK_LIB_DIR = '/usr/lib'
+ GLPK_INC_DIR = '/usr/include'
# Set to 1 if you are installing the DSDP module.
-BUILD_DSDP = 0
@@ -43,10 +41,3 @@ Index: cvxopt-1.1.2/src/setup.py
# Directory containing libdsdp (used only when BUILD_DSDP = 1).
DSDP_LIB_DIR = '/usr/lib'
-
- # Directory containing dsdp5.h (used only when BUILD_DSDP = 1).
--DSDP_INC_DIR = '/usr/include'
-+DSDP_INC_DIR = '/usr/include/dsdp'
-
- extmods = []
-
diff --git a/debian/patches/use_debian_packaged_libsuitesparse.diff b/debian/patches/use_debian_packaged_libsuitesparse.diff
new file mode 100644
index 0000000..5ca5ae8
--- /dev/null
+++ b/debian/patches/use_debian_packaged_libsuitesparse.diff
@@ -0,0 +1,24 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Wed, 20 Jul 2016 08:33:05 +0200
+Bug-Debian: https://bugs.debian.org/719804
+Description: Use Debian packaged libsuitesparse
+
+--- a/setup.py
++++ b/setup.py
+@@ -55,13 +55,13 @@ DSDP_LIB_DIR = '/usr/lib'
+ DSDP_INC_DIR = '/usr/include/dsdp'
+
+ # Set to 1 to use external SuiteSparse library
+-SUITESPARSE_EXT_LIB = 0
++SUITESPARSE_EXT_LIB = 1
+
+ # Directory containing external SuiteSparse library
+-SUITESPARSE_LIB_DIR = '/usr/local/lib'
++SUITESPARSE_LIB_DIR = '/usr/lib'
+
+ # Directory containing SuiteSparse header files
+-SUITESPARSE_INC_DIR = '/usr/local/include'
++SUITESPARSE_INC_DIR = '/usr/include/suitesparse'
+
+ # No modifications should be needed below this line.
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cvxopt.git
More information about the debian-science-commits
mailing list