From 3a99e0ffbba145c6b86d7ecab41c745b72973569 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Mon, 4 Feb 2013 10:39:29 -0500 Subject: changed to stock BSD 2-clause license Conflicts: AUTHORS README doc/appendix/contributors.txt --- debian/bcfg2-server.docs | 3 ++- debian/bcfg2.docs | 4 ++- debian/copyright | 70 +++++++++++++++++++++++++++++------------------- 3 files changed, 47 insertions(+), 30 deletions(-) (limited to 'debian') diff --git a/debian/bcfg2-server.docs b/debian/bcfg2-server.docs index 62deb0497..fea4b1e8f 100644 --- a/debian/bcfg2-server.docs +++ b/debian/bcfg2-server.docs @@ -1 +1,2 @@ -AUTHORS +LICENSE +COPYRIGHT diff --git a/debian/bcfg2.docs b/debian/bcfg2.docs index 62deb0497..57c7cb760 100644 --- a/debian/bcfg2.docs +++ b/debian/bcfg2.docs @@ -1 +1,3 @@ -AUTHORS +LICENSE +COPYRIGHT + diff --git a/debian/copyright b/debian/copyright index 224d3659a..b7b93da85 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,44 +4,58 @@ It was downloaded from http://trac.mcs.anl.gov/projects/bcfg2/ Upstream Author: Narayan Desai -Copyright: - 2004 - 2006: University of Chicago +Copyright: + 2004 - 20013: University of Chicago License: Unless otherwise specified, files are copyright by the following: -The following is a notice of limited availability of the code, and disclaimer -which must be included in the prologue of the code and in all source listings -of the code. - -Copyright Notice - + 2004 University of Chicago - -Permission is hereby granted to use, reproduce, prepare derivative works, and -to redistribute to others. This software was authored by: - -Argonne National Laboratory -N. Desai: (630) 252-7587; FAX: (630) 252-5986; e-mail: desai@mcs.anl.gov -Mathematics and Computer Science Division -Argonne National Laboratory, Argonne IL 60439 - +Copyright (c) 2004, University of Chicago. See the COPYRIGHT file at + the top-level directory of this distribution and at + https://github.com/Bcfg2/bcfg2/blob/master/COPYRIGHT. + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +* Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimers. +* Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimers in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. GOVERNMENT LICENSE Portions of this material resulted from work developed under a U.S. -Government Contract and are subject to the following license: the Government -is granted for itself and others acting on its behalf a paid-up, nonexclusive, -irrevocable worldwide license in this computer software to reproduce, prepare -derivative works, and perform publicly and display publicly. +Government Contract and are subject to the following license: the +Government is granted for itself and others acting on its behalf a +paid-up, nonexclusive, irrevocable worldwide license in this computer +software to reproduce, prepare derivative works, and perform publicly +and display publicly. DISCLAIMER -This computer code material was prepared, in part, as an account of work -sponsored by an agency of the United States Government. Neither the United -States, nor the University of Chicago, nor any of their employees, makes any -warranty express or implied, or assumes any legal 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. +This computer code material was prepared, in part, as an account of +work sponsored by an agency of the United States Government. Neither +the United States, nor the University of Chicago, nor any of their +employees, makes any warranty express or implied, or assumes any legal +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. -- cgit v1.2.3-1-g7c22