From 841201380437844378e225c255c4f6af53f2f2b5 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 30 Dec 2016 12:01:59 +0100 Subject: [PATCH] update the licensing info after the answer from Bronis de Supinski --- COPYING | 48 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/COPYING b/COPYING index e99606b4a0..763c3b3599 100644 --- a/COPYING +++ b/COPYING @@ -171,8 +171,46 @@ Copyright: License: GPL-3+ and LGPL-2.1 Comment: Generated with the Bison processor generator (which is GPL-3+) using SimGrid configuration files (that are LGPL-2.1) -Files: debian/* -Copyright: - Copyright (2011 Lucas Nussbaum - Copyright (C) 2013-2016 Martin Quinson -License: LGPL-2.1 +Files: teshsuite/smpi/isp/umpire/* +Copyright: 2000-2003, Bronis R. de Supinski +Comment: this licensing info was provided by the author per email +License: NON COMMERCIAL + NOTICE + . + This work was produced at the University of California, Lawrence + Livermore National Laboratory (UC LLNL) under contract + no. W-7405-ENG-48 (Contract 48) between the U.S. Department of Energy + (DOE) and The Regents of the University of California (University) for + the operation of UC LLNL. The rights of the Federal Government are + reserved under Contract 48 subject to the restrictions agreed upon by + the DOE and University as allowed under DOE Acquisition Letter 97-1. + The only additional restriction is that redistribution of this work + without the written consent of either the Univeristy or its primary + author, Bronis R. de Supinski, is prohibited. + . + . + DISCLAIMER + . + This work was prepared as an account of work sponsored by an agency of + the United States Government. Neither the United States Government nor + the University of California nor any of their employees, makes any + warranty, express or implied, or assumes any liability or + responsibility for the accuracy, completeness, or usefulness of any + information, apparatus, product, or process disclosed, or represents + that its use would not infringe privately-owned rights. Reference + herein to any specific commercial products, process, or service by + trade name, trademark, manufacturer or otherwise does not necessarily + constitute or imply its endorsement, recommendation, or favoring by + the United States Government or the University of California. The + views and opinions of authors expressed herein do not necessarily + state or reflect those of the United States Government or the + University of California, and shall not be used for advertising or + product endorsement purposes. + . + . + . + NOTIFICATION OF COMMERCIAL USE + . + Commercialization of this product is prohibited without notifying the + Department of Energy (DOE) or Lawrence Livermore National Laboratory + (LLNL). -- 2.20.1