Skip to content

Commit

Permalink
Fix licence.
Browse files Browse the repository at this point in the history
  • Loading branch information
Hamish Ivey-Law committed Jul 31, 2018
1 parent 8ca455b commit f340576
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 695 deletions.
62 changes: 42 additions & 20 deletions LICENCE
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
CSIRO Open Source Software Licence v1.0
(Based on MIT/BSD Open Source Licence)

IMPORTANT – PLEASE READ CAREFULLY

This document contains the terms under which CSIRO agrees to licence its
Expand All @@ -8,18 +11,21 @@ licensing from CSIRO. Both documents together form this agreement.
The Software is copyright (c) Commonwealth Scientific and Industrial Research
Organisation (CSIRO) ABN 41 687 119 230.

Except where otherwise indicated, including in the Supplementary Licence, CSIRO
grants you a licence to the Software on the terms of the GNU General Public
Licence version 3 (GPLv3), distributed at: http://www.gnu.org/licenses/gpl.html.

The following additional terms apply under clause 7 of GPLv3 to the licence of
the Software that is granted by CSIRO:
Redistribution and use of this Software in source and binary forms, with or
without modification, are permitted provided that the following conditions are
met:

EXCEPT AS EXPRESSLY STATED IN THIS AGREEMENT AND TO THE FULL EXTENT PERMITTED BY
APPLICABLE LAW, THE SOFTWARE IS PROVIDED "AS-IS". CSIRO MAKES NO
REPRESENTATIONS, WARRANTIES OR CONDITIONS OF ANY KIND, EXPRESS OR IMPLIED,
INCLUDING BUT NOT LIMITED TO ANY REPRESENTATIONS, WARRANTIES OR CONDITIONS
REGARDING THE CONTENTS OR ACCURACY OF THE SOFTWARE, OR OF TITLE,
Redistributions of source code must retain the above copyright notice, this list
of conditions and the following disclaimer. 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 CSIRO nor the names of its contributors may be
used to endorse or promote products derived from this software without specific
prior written permission of CSIRO. EXCEPT AS EXPRESSLY STATED IN THIS AGREEMENT
AND TO THE FULL EXTENT PERMITTED BY APPLICABLE LAW, THE SOFTWARE IS PROVIDED
"AS-IS". CSIRO MAKES NO REPRESENTATIONS, WARRANTIES OR CONDITIONS OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY REPRESENTATIONS, WARRANTIES
OR CONDITIONS REGARDING THE CONTENTS OR ACCURACY OF THE SOFTWARE, OR OF TITLE,
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, THE ABSENCE
OF LATENT OR OTHER DEFECTS, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
DISCOVERABLE.
Expand All @@ -45,15 +51,31 @@ PERMITTED BY THE APPLICABLE LEGISLATION, THE LIABILITY OF CSIRO UNDER THE
RELEVANT CONSUMER GUARANTEE IS LIMITED (WHERE PERMITTED AT CSIRO’S OPTION) TO
ONE OF FOLLOWING REMEDIES OR SUBSTANTIALLY EQUIVALENT REMEDIES:

(a) THE REPLACEMENT OF THE SOFTWARE, THE SUPPLY OF EQUIVALENT SOFTWARE, OR
SUPPLYING RELEVANT SERVICES AGAIN;
(b) THE REPAIR OF THE SOFTWARE;
(c) THE PAYMENT OF THE COST OF REPLACING THE SOFTWARE, OF ACQUIRING EQUIVALENT
SOFTWARE, HAVING THE RELEVANT SERVICES SUPPLIED AGAIN, OR HAVING THE SOFTWARE
REPAIRED.
(a) THE REPLACEMENT OF THE SOFTWARE, THE SUPPLY OF EQUIVALENT SOFTWARE, OR
SUPPLYING RELEVANT SERVICES AGAIN;

(b) THE REPAIR OF THE SOFTWARE;

(c) THE PAYMENT OF THE COST OF REPLACING THE SOFTWARE, OF ACQUIRING EQUIVALENT
SOFTWARE, HAVING THE RELEVANT SERVICES SUPPLIED AGAIN, OR HAVING THE SOFTWARE
REPAIRED.

IN THIS CLAUSE, CSIRO INCLUDES ANY THIRD PARTY AUTHOR OR OWNER OF ANY PART OF
THE SOFTWARE OR MATERIAL DISTRIBUTED WITH IT. CSIRO MAY ENFORCE ANY RIGHTS ON
BEHALF OF THE RELEVANT THIRD PARTY.
BEHALF OF THE RELEVANT THIRD PARTY.

If you intend to access the Software in connection with your employment or as an
agent for a principal, you should only accept this agreement if you have been
authorised to do so by your employer or principal (as applicable). By accepting
this agreement, you are warranting to CSIRO that you are authorised to do so on
behalf of your employer or principal (as applicable).

The Software may contain third party material obtained by CSIRO under licence.
Your rights to such material as part of the Software under this agreement is
subject to any separate licence terms identified by CSIRO as part of the
Software release - including as part of the Supplementary Licence, or as a
separate file. Those third party licence terms may require you to download the
relevant software from a third party site, or may mean that the third party
licensor (and not CSIRO) grants you a licence directly for those components of
the Software. It is your responsibility to ensure that you have the necessary
rights to such third party material.
Loading

0 comments on commit f340576

Please sign in to comment.