[gmsh] 03/06: Update d/copyright.

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository gmsh.

commit 3acaa495d379637ff7ed7288e1a18a1b23be0041
Author: Anton Gladky <gladk at debian.org>
Date:   Sun Jan 3 10:56:39 2016 +0100

    Update d/copyright.
---
 debian/copyright | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index c176008..d85cf5f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,7 +8,9 @@ Files-Excluded:
 Files: *
 Copyright: 1997-2015 Christophe Geuzaine <geuzaine at acm.caltech.edu>
                      Jean-Francois Remacle <remacle at gce.ucl.ac.be>
-License: GPL-2+, with the following exception:
+License: GPL-2+
+ GPL-2 license is applied here with the following exception.
+ .
  The copyright holders of Gmsh give you permission to combine Gmsh
  with code included in the standard release of TetGen (from Hang Si),
  Netgen (from Joachim Sch"oberl), Chaco (from Bruce Hendrickson and
@@ -67,7 +69,7 @@ License: other
 
 Files: contrib/voro++/*
 Copyright: 2008 The Regents of the University of California
-License: BSD-3
+License: BSD-3-clause
  Voro++ Copyright (c) 2008, The Regents of the University of California, through
  Lawrence Berkeley National Laboratory (subject to receipt of any required
  approvals from the U.S. Dept. of Energy). All rights reserved.
@@ -118,6 +120,34 @@ License: public-domain
  contrib/rtree/README says:
  Entirely free for all uses.
 
+Files: contrib/Revoropt/*
+Copyright: (C) 2013 Vincent Nivoliers <vincent.nivoliers at univ-lyon1.fr>
+License: MPL-2.0
+ This Source Code Form is subject to the terms of the Mozilla
+ Public License v. 2.0. If a copy of the MPL was not distributed
+ with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+Files: contrib/zipper/*
+Copyright: (c) 1998-2010 - Gilles Vollant
+                           Mathias Svensson
+License: zlib
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+  .
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+  .
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+
 License: LGPL-2.1
  On Debian systems, the full text of the GNU LESSER GENERAL PUBLIC
  LICENSE version 2.1 can be found in the file

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