aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames E.H. Turner <jturner@gemini.edu>2016-10-20 13:01:13 -0400
committerJames E.H. Turner <jturner@gemini.edu>2016-10-20 13:01:13 -0400
commite18194d896c17bc3a31198972981e652fea79596 (patch)
tree590eda14dc2332e216c7d4b6218603ff098b2872
parentae7e602a4ec23aa1664232a8b9d1ecaf4a20b3b6 (diff)
downloadastroconda-iraf-e18194d896c17bc3a31198972981e652fea79596.tar.gz
Use AURA's version of the BSD licence, as intended, rather than the template version added by github.
-rw-r--r--LICENSE45
1 files changed, 20 insertions, 25 deletions
diff --git a/LICENSE b/LICENSE
index 922aa3a..dbb6b41 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,29 +1,24 @@
-BSD 3-Clause License
+Copyright (C) 2016 Association of Universities for Research in Astronomy, Inc. (AURA)
-Copyright (c) 2016, AstroConda
-All rights reserved.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+1) Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+2) Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+3) The name of AURA and its representatives may not be used to endorse or
+promote products derived from this software without specific prior written
+permission.
-* Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
+THIS SOFTWARE IS PROVIDED BY AURA "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 AURA 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.
-* Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-* Neither the name of the copyright holder nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
-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.