From 7253bac48ab5bee324df4f9b115a3477686dd430 Mon Sep 17 00:00:00 2001 From: Dave Hickin Date: Wed, 2 Sep 2015 14:04:29 +0100 Subject: [PATCH] Updated copyright notice and license Updated copyright notice using the one in normativeTypesCPP. Added Diamond and BNL. Added legal discalimers for Diamond and BNL to license. Added dates to copyright notice. "All rights reserved" added to copyright. --- COPYRIGHT | 35 +++++++++++++++++++++++++++-------- LICENSE | 42 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 66 insertions(+), 11 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 840d01e..1461f72 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,12 +1,31 @@ -/**************************************************** -Copyright (c) 2008 All rights reserved -Copyright (c) 2008 Martin R. Kraimer -Copyright (c) 2006 The University of Chicago, as Operator of Argonne - National Laboratory. +This software is in part copyrighted by the various organizations and +individuals listed below. Permission to use it is set out in the file +LICENSE that accompanies the software. + +In no event shall any copyright holder be liable to any party for +direct, indirect, special, incidental, or consequential damages arising +out of the use of this software, its documentation, or any derivatives +thereof, even if they have been advised of the possibility of such +damage. + +The copyright holders specifically disclaim any warranties, including, +but not limited to, the implied warranties of merchantability, fitness +for a particular purpose, and non-infringement. This software is +provided on an "as is" basis, and the copyright holders have no +obligation either collectively or individually to provide maintenance, +support, updates, enhancements, or modifications. + +Copyright (c) 2006 - 2015 All rights reserved + +Martin R. Kraimer +The University of Chicago, as Operator of Argonne National Laboratory. Deutsches Elektronen-Synchroton, Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY, BERLINER SPEICHERRING GESELLSCHAFT FUER SYNCHROTRONSTRAHLUNG M.B.H. (BESSY), BERLIN, GERMANY. -COSYLAB (Control System Laboratory) - (Cosylab) Ljubljana Slovenia -*************************************************** */ +COSYLAB (Control System Laboratory), Ljubljana, Slovenia. +Brookhaven Science Associates, as Operator of Brookhaven + National Laboratory. +Diamond Light Source Ltd., Didcot, United Kingdom. + + diff --git a/LICENSE b/LICENSE index 3f43ff2..eca704e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,12 +1,15 @@ -Copyright (c) 2008 Martin R. Kraimer +Copyright (c) 2006-2015 Martin R. Kraimer Copyright (c) 2006 The University of Chicago, as Operator of Argonne National Laboratory. Copyright (c) 2006 Deutsches Elektronen-Synchrotron, Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY. -Copyright (c) 2007 Control System Laboratory, +Copyright (c) 2007-2015 Control System Laboratory, (COSYLAB) Ljubljana Slovenia - +Copyright (c) 2010-2015 Brookhaven Science Associates, as Operator of Brookhaven + National Laboratory +Copyright (c) 2011-2015 Diamond Light Source Limited, + (DLS) Didcot, United Kingdom Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -75,4 +78,37 @@ to, the implied warranties of merchantability, fitness for a particular purpose, and non-infringement. This software is provided on an "as is" basis, and DESY has no obligation to provide maintenance, support, updates, enhancements, or modifications. + +______________________________________________________________________ + +This software is in part copyrighted by the Brookhaven + National Laboratory (BNL). + +In no event shall BNL be liable to any party for direct, indirect, +special, incidental, or consequential damages arising out of the use of +this software, its documentation, or any derivatives thereof, even if +BNL has been advised of the possibility of such damage. + +BNL specifically disclaims any warranties, including, but not limited +to, the implied warranties of merchantability, fitness for a particular +purpose, and non-infringement. This software is provided on an "as is" +basis, and BNL has no obligation to provide maintenance, support, +updates, enhancements, or modifications. + ________________________________________________________________________ + +This software is in part copyrighted by Diamond Light Source Limited (DLS) + +In no event shall DLS be liable to any party for direct, indirect, +special, incidental, or consequential damages arising out of the use of +this software, its documentation, or any derivatives thereof, even if +DLS has been advised of the possibility of such damage. + +DLS specifically disclaims any warranties, including, but not limited +to, the implied warranties of merchantability, fitness for a particular +purpose, and non-infringement. This software is provided on an "as is" +basis, and DLS has no obligation to provide maintenance, support, +updates, enhancements, or modifications. + +________________________________________________________________________ +