[glpk] 02/07: d/copyright: reflect upstream changes.

[Sébastien Villemot]

This is an automated email from the git hooks/post-receive script.

sebastien pushed a commit to branch master
in repository glpk.

commit 8327ccffbade68ded3398772a7a9bf510eb3a90b
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Mon Jan 23 20:21:58 2017 +0100

    d/copyright: reflect upstream changes.
---
 debian/copyright | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index e18675c..dae57ca 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,14 +4,29 @@ Upstream-Contact: Andrew Makhorin <mao at gnu.org>
 Source: http://www.gnu.org/software/glpk/glpk.html
 
 Files: *
-Copyright: 2000-2016 Andrew Makhorin, Department for Applied
+Copyright: 2000-2017 Andrew Makhorin, Department for Applied
            Informatics, Moscow Aviation Institute, Moscow, Russia.
            E-mail: <mao at gnu.org>.
 License: GPL-3+
 
+Files: examples/threads/thread.h
+Copyright: 2011-2017 Heinrich Schuchardt <xypron.glpk at gmx.de>
+License: permissive
+ Permission to use, copy, modify, and/or distribute this software for
+ any purpose with or without fee is hereby granted.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+ OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.
+
 Files: src/amd/*
        src/colamd/*
-Copyright: 1998-2007 Timothy A. Davis,
+Copyright: 1998-2007 Timothy A. Davis
 License: LGPL-2.1+
  This library is free software; you can redistribute it and/or modify it
  under the terms of the GNU Lesser General Public License as published by
@@ -53,7 +68,7 @@ License: Zlib
 Files: aclocal.m4
        m4/*
 Copyright: 1992-2013, Free Software Foundation, Inc
-License: permissive
+License: permissive-fsf
  This file is free software; the Free Software Foundation gives
  unlimited permission to copy and/or distribute it, with or without
  modifications, as long as this notice is preserved.
@@ -83,7 +98,7 @@ License: Expat
 Files: debian/*
 Copyright: 2001-2006 Falk Hueffner <falk at debian.org>
            2006-2008 Rafael Laboissiere <rafael at laboissiere.net>
-           2013-2016 Sébastien Villemot <sebastien at debian.org>
+           2013-2017 Sébastien Villemot <sebastien at debian.org>
 License: GPL-3+
 
 License: GPL-3+

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