[cvxopt] 39/64: DEP5

[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 67fb610e1e218249ffe136abfe2e69be09b1b9e7
Author: Andreas Tille <tille at debian.org>
Date:   Wed Jul 20 08:50:21 2016 +0200

    DEP5
---
 debian/changelog |  1 +
 debian/copyright | 68 ++++++++++++++++++++++++++------------------------------
 2 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ed8deef..7ab561e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 cvxopt (1.1.4-2) UNRELEASED; urgency=medium
 
   * Team maintenance in Debian Science team
+  * DEP5
 
  -- Andreas Tille <tille at debian.org>  Wed, 20 Jul 2016 08:33:05 +0200
 
diff --git a/debian/copyright b/debian/copyright
index c7c8370..76b3530 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,46 +1,45 @@
-This package was debianized by Soeren Sonnenburg <sonne at debian.org> on
-Wed Jul  4 21:48:22 CEST 2007.
-
-It was downloaded from <http://abel.ee.ucla.edu/cvxopt>.
-
-Upstream Authors:
-
-Joachim Dahl <joachim at kom.aau.dk>
-Lieven Vandenberghe <vandenbe at ee.ucla.edu>
-
-Copyright:
-
-(C) 2004-2007 Joachim Dahl <joachim at kom.aau.dk>
-(C) 2004-2007 Lieven Vandenberghe <vandenbe at ee.ucla.edu>
-
-License:
-
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: cvxopt
+Source: https://github.com/cvxopt/cvxopt/releases
+
+Files: *
+Copyright: 2004-2015 Joachim Dahl <joachim at kom.aau.dk>
+           2004-2015 Lieven Vandenberghe <vandenbe at ee.ucla.edu>
+License: GPL-3+
+
+Files: src/C/SuiteSparse/*
+Copyright: 2004-2007 by Timothy A. Davis, Patrick R., Amestoy, and Iain S.
+License: LGPL-2.1+
+
+Files: src/C/SuiteSparse/CHOLMOD/*
+Copyright: 2004-2007 Univ. of Florida
+           2004-2007 T. A. Davis and W. Hager
+License: LGPL-2.1+
+
+Files: debian/*
+Copyright: 2007-2014 Soeren Sonnenburg <sonne at debian.org>
+           2016 Andreas Tille <tille at debian.org>
+License: GPL-3+
+
+License: GPL-3+
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation; either version 3 of the License, or
 	(at your option) any later version.
-
+ .
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
+ .
+ A copy of the GNU General Public License can be found in
+ /usr/share/common-licenses/GPL-3.
 
-A copy of the GNU General Public License can be found in
-/usr/share/common-licenses/GPL-3.
-
-----
+License: LGPL-2.1+
+ On Debian systems, you can find the GPL license in:
+ /usr/share/common-licenses/LGPL-2.1
 
-The CVXOPT distribution includes source code for the following software
-libraries.
-
-	AMD Version 2.0. Copyright (c) 2004-2007 by Timothy A. Davis, Patrick R.
-	Amestoy, and Iain S.  Duff. All Rights Reserved. Distributed under the GNU
-	LGPL license. See www.cise.ufl.edu/research/sparse/amd.
 	
-	CHOLMOD Version 1.4.  Copyright (c) 2004-2007. Some portions are Copyright
-	(c) Univ. of Florida.  Others are Copyright (c) by their authors (T. A.
-	Davis and W. Hager).  Distributed under the GNU LGPL license.
-	See www.cise.ufl.edu/research/sparse/cholmod.
 	
 	COLAMD version 2.6.  Copyright (c) 1998-2006 by Timothy A. Davis.  Copyright
 	(c) 1998-2007, Timothy A. Davis, All Rights Reserved.  COLAMD is distributed
@@ -65,8 +64,3 @@ libraries.
 
     On Debian systems, you can find the GPL license in:
     /usr/share/common-licenses/LGPL
-
-----
-
-The Debian packaging is (C) 2007, Soeren Sonnenburg <sonne at debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.

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