[cvxopt] 02/05: Update patches for new upstream version
Andreas Tille
tille at debian.org
Mon Jun 19 15:35:04 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository cvxopt.
commit 1b9aeade62fb1b45d516406e94e3eb2f0d3ea00f
Author: Andreas Tille <tille at debian.org>
Date: Mon Jun 19 16:58:39 2017 +0200
Update patches for new upstream version
---
debian/changelog | 6 +++
debian/patches/glpk-4.49.diff | 2 +-
debian/patches/setup.diff | 12 ++---
.../use_debian_packaged_libsuitesparse.diff | 57 +++-------------------
4 files changed, 21 insertions(+), 56 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 49f98d4..1fdeb90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cvxopt (1.1.9+dfsg-1) UNRELEASED; urgency=medium
+
+ * New upstream version
+
+ -- Andreas Tille <tille at debian.org> Mon, 19 Jun 2017 16:58:26 +0200
+
cvxopt (1.1.8+dfsg-1) experimental; urgency=medium
* New upstream version
diff --git a/debian/patches/glpk-4.49.diff b/debian/patches/glpk-4.49.diff
index f35da87..35eac08 100644
--- a/debian/patches/glpk-4.49.diff
+++ b/debian/patches/glpk-4.49.diff
@@ -2112,7 +2112,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+/* eof */
--- a/setup.py
+++ b/setup.py
-@@ -117,7 +117,7 @@ if BUILD_GLPK:
+@@ -131,7 +131,7 @@ if BUILD_GLPK:
glpk = Extension('glpk', libraries = ['glpk'],
include_dirs = [ GLPK_INC_DIR ],
library_dirs = [ GLPK_LIB_DIR ],
diff --git a/debian/patches/setup.diff b/debian/patches/setup.diff
index 7c53201..a088a54 100644
--- a/debian/patches/setup.diff
+++ b/debian/patches/setup.diff
@@ -5,7 +5,7 @@ Description: Take over old patch to new upstream version.
--- a/setup.py
+++ b/setup.py
-@@ -19,7 +19,7 @@ BLAS_NOUNDERSCORES = False
+@@ -20,7 +20,7 @@ BLAS_NOUNDERSCORES = False
# Set to 1 if you are using the random number generators in the GNU
# Scientific Library.
@@ -14,25 +14,25 @@ Description: Take over old patch to new upstream version.
# Directory containing libgsl (used only when BUILD_GSL = 1).
GSL_LIB_DIR = '/usr/lib'
-@@ -28,7 +28,7 @@ GSL_LIB_DIR = '/usr/lib'
+@@ -29,7 +29,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'
-@@ -37,7 +37,7 @@ FFTW_LIB_DIR = '/usr/lib'
+@@ -38,7 +38,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'
-@@ -46,7 +46,7 @@ GLPK_LIB_DIR = '/usr/lib'
+@@ -47,7 +47,7 @@ GLPK_LIB_DIR = '/usr/lib'
GLPK_INC_DIR = '/usr/include'
# Set to 1 if you are installing the DSDP module.
diff --git a/debian/patches/use_debian_packaged_libsuitesparse.diff b/debian/patches/use_debian_packaged_libsuitesparse.diff
index aea6f58..42358a9 100644
--- a/debian/patches/use_debian_packaged_libsuitesparse.diff
+++ b/debian/patches/use_debian_packaged_libsuitesparse.diff
@@ -5,56 +5,15 @@ 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'
+@@ -57,7 +57,7 @@ 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.
-
---- a/doc/source/copyright.rst
-+++ b/doc/source/copyright.rst
-@@ -23,30 +23,3 @@ See the
- `GNU General Public License <http://www.gnu.org/licenses/gpl-3.0.html>`_
- for more details.
-
------
--
--
--The CVXOPT distribution includes the source code of part of the
--`SuiteSparse <http://www.suitesparse.com>`_
--collection of sparse matrix algorithms. The copyright and license
--information for the included libraries is as follows.
--
--* **AMD** Version 2.4.1. Copyright (c) 2009-2014 by Timothy A. Davis,
-- Patrick R. Amestoy, and Iain S. Duff.
--
--* **CHOLMOD** Version 3.0.6. Copyright (c) 2005-2015 by the
-- University of Florida, Timothy A. Davis, and W. Hager.
--
--* **COLAMD** Version 2.9.1. Copyright (c) 1998-2014 by Timothy A. Davis.
--
--* **UMFPACK** Version 5.7.1. Copyright (c) 1995-2014 by Timothy A. Davis.
--
--UMFPACK and the Supernodal and MatrixOps modules of CHOLMOD are licensed
--under the terms of the `GNU General Public License, version 2
--<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>`_ or higher.
--The other CHOLMOD modules, AMD, and COLAMD are licensed under the terms of
--the `GNU Lesser General Public License, version 2.1
--<http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html>`_ or higher.
--For more details, consult the README files in the source directories or
--the documentation at `SuiteSparse <http://www.suitesparse.com>`_.
--
+ # Guess SUITESPARSE_LIB_DIR and SUITESPARSE_INC_DIR
+ lnx_dist = platform.linux_distribution()
+-if lnx_dist[0] == "Ubuntu" and lnx_dist[1] >= "16":
++if lnx_dist[0] == "Debian" or ( lnx_dist[0] == "Ubuntu" and lnx_dist[1] >= "16" ):
+ # Ubuntu 16.04 or later
+ SUITESPARSE_LIB_DIR = "/usr/lib/x86_64-linux-gnu"
+ SUITESPARSE_INC_DIR = "/usr/include/suitesparse"
--- a/src/python/info.py
+++ b/src/python/info.py
@@ -19,26 +19,5 @@ GNU General Public License for more deta
--
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