Skip to content

Commit

Permalink
update license to use bsd3 template only in the file for cran resubmi…
Browse files Browse the repository at this point in the history
…ssion.

Explain changes in cran-comments.md
  • Loading branch information
MattPM committed Sep 2, 2021
1 parent 2773e39 commit 5e375d9
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 42 deletions.
34 changes: 3 additions & 31 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,37 +1,9 @@
================

YEAR:2021
COPYRIGHT HOLDER: NA
COPYRIGHT HOLDER: This software is not subject to copyright protection and is in the public domain.
ORGANIZATION: National Institute of Allergy and Infectious Diseases (NIAID), a participating institute of the National Institutes of Health (NIH)

Copyright (c) 2021, COPYRIGHT HOLDER: NA
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 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 the <ORGANIZATION> 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


=======================================
ALTERNATIVE LICENSE INFORMATION FOLLOWS
=======================================
Expand Down
23 changes: 12 additions & 11 deletions cran-comments.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,25 @@ This is a resubmission:
In response to:

###########################
Tnanks, I think your LICENSE file is not clear:
better, but then only the template part for BSD_3_clause, i.e. I'd porpose the following (while it is advisable to clearly state the copyright holders):

I'd suggest to start with the BSD_3_clause template.
Afterwards perhaps add a well recognizable separator (as other team
members have not udnerstood this is about an extra license) and say an
alternative license follows as in:

================

YEAR:2021
COPYRIGHT HOLDER: NA
ORGANIZATION: National Institute of Allergy and Infectious Diseases (NIAID), a participating institute of the National Institutes of Health (NIH)


=======================================
ALTERNATIVE LICENSE INFORMATION FOLLOWS
=======================================


###########################

I have added the template for the BSD3 clause license as well as the additional limited liability text which is required for software developed by the US National Institutes of Health, separated by the suggested separator:
Thank you for your help. I have added the template part for the BSD3 clause with the alternative license information as suggested.
With respect to copyright, since we are public employees of the us government, the software is part of the public domain and it is not subject to copyright. For example, this is also the case for the popular software imageJ https://imagej.nih.gov/ij/disclaimer.html.
That is stated in the alternative license text; I also stated this directly in the BSD-3 license template in the COPYRIGHT field.


=======================================
ALTERNATIVE LICENSE INFORMATION FOLLOWS
=======================================

R package dsb... [remainder of additional license text]

0 comments on commit 5e375d9

Please sign in to comment.