[cvxopt] 04/05: Consequently also remove the doc mentioning that suitesparse is included as well
Andreas Tille
tille at debian.org
Sat Mar 11 15:18:22 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 e258842efc1493aef9b42bf50dcfe034809e46e2
Author: Andreas Tille <tille at debian.org>
Date: Fri Mar 10 22:26:43 2017 +0100
Consequently also remove the doc mentioning that suitesparse is included as well
---
debian/copyright | 1 +
.../use_debian_packaged_libsuitesparse.diff | 33 ++++++++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/debian/copyright b/debian/copyright
index 6f9a971..87c168c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,6 +11,7 @@ Files-Excluded: */*.gif
Files: *
Copyright: 2004-2015 Joachim Dahl <joachim at kom.aau.dk>
2004-2015 Lieven Vandenberghe <vandenbe at ee.ucla.edu>
+ 2012-2015 M. Andersen
License: GPL-3+
Files: debian/*
diff --git a/debian/patches/use_debian_packaged_libsuitesparse.diff b/debian/patches/use_debian_packaged_libsuitesparse.diff
index 5ca5ae8..befe7cc 100644
--- a/debian/patches/use_debian_packaged_libsuitesparse.diff
+++ b/debian/patches/use_debian_packaged_libsuitesparse.diff
@@ -22,3 +22,36 @@ Description: Use Debian packaged libsuitesparse
# 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>`_.
+-
--
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