more license fixups

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2611 ce84e21b-d406-0410-9b95-82705330c041

1 files changed, 25 insertions, 69 deletions

diff --git a/debian/copyright b/debian/copyright
index cc6802369..224d3659a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,81 +11,37 @@ License:
 
 Unless otherwise specified, files are copyright by the following:
 
-BCFG Public License
+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 (c) University of Chicago 2004-2006.
+Copyright Notice
+ + 2004 University of Chicago
 
-1. The "Software", below, refers to the MCS Systems Administration Toolkit
-   (in either source-code, or binary form) and a "work based on the
-   Software" means a work based on either the Software, on part of the
-   Software, or on any derivative work of the Software under copyright law:
-   that is, a work containing all or a portion of the Software either
-   verbatim or with modifications.  Each licensee is addressed as "you" or
-   "Licensee."
+Permission is hereby granted to use, reproduce, prepare derivative works, and
+to redistribute to others.  This software was authored by:
 
-2. The University of Chicago as Operator of Argonne National Laboratory is
-   the copyright holder in the Software.  The copyright holder reserves all
-   rights except those expressly granted to the Licensee herein and
-   U.S. Government license rights.
+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
 
-3. A copy or copies of the Software may be given to others, if you meet the
-   following conditions:
 
-   a) Copies in source code must include the copyright notice and this 
-      license.
+			      GOVERNMENT LICENSE
 
-   b) Copies in binary form must include the copyright notice and 
-      this license in the documentation and/or other materials provided 
-      with the copy.
+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.
 
-4. All advertising materials, journal articles and documentation mentioning
-   features derived from or use of the Software must display the following
-   acknowledgment:
+				  DISCLAIMER
 
-     "This product includes software developed by the MCS Systems Group
-      at Argonne National Laboratory (http://www.mcs.anl.gov/systems/)."
+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.
 
-   In the event that the product being advertised includes an intact
-   distribution of the Software (with copyright and license included) then
-   this clause is waived.
-
-5. You are encouraged to package modifications to the Software separately,
-   as patches to the Software.
-
-6. If you modify a copy or copies of the Software or any portion of it,
-   thus forming a work based on the Software, and give a copy or copies of
-   such work to others, either in source code or binary form, you must meet
-   the following conditions:
-
-   a) The Software must carry prominent notices stating that you changed
-      specified portions of the Software.
-
-   b) The Software must display the following acknowledgment: "This product
-      includes software developed by and/or derived from work of Argonne
-      National Laboratory to which the U.S. Government retains certain
-      rights."
-
-7. LICENSEE AGREES THAT THE EXPORT OF GOODS AND/OR TECHNICAL DATA FROM THE
-   UNITED STATES MAY REQUIRE SOME FORM OF EXPORT CONTROL LICENSE FROM THE
-   U.S. GOVERNMENT AND THAT FAILURE TO OBTAIN SUCH EXPORT CONTROL LICENSE
-   MAY RESULT IN CRIMINAL LIABILITY UNDER U.S. LAWS.
-
-8. Portions of the Software 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.
-
-9. The Software was prepared, in part, as an account of work sponsored by
-   an agency of the U.S. 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.
-
-10. IN NO EVENT WILL THE UNITED STATES, OR THE UNIVERSITY OF CHICAGO BE
-   LIABLE FOR ANY DAMAGES, INCLUDING DIRECT, INCIDENTAL, SPECIAL, OR
-   CONSEQUENTIAL DAMAGES RESULTING FROM EXERCISE OF THIS LICENSE AGREEMENT
-   OR THE USE OF THE SOFTWARE.