Skip to content

Commit

Permalink
A few fixes to be more clear on licence
Browse files Browse the repository at this point in the history
  • Loading branch information
GiovanniBussi committed Jan 20, 2014
1 parent abc00f6 commit a78e1a0
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 2 deletions.
10 changes: 8 additions & 2 deletions PEOPLE
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
All the source code included in this package is meant to be covered
under the GNU LESSER GENERAL PUBLIC LICENSE (see ./COPYING.LESSER).
PLUMED2 is covered under the GNU LESSER GENERAL PUBLIC LICENSE (see ./COPYING.LESSER).
This license applies to all the source code in this tree, except from where
explicitly indicated.

Authors of this software are:

Expand All @@ -9,3 +10,8 @@ Giovanni Bussi
Carlo Camilloni
Gareth Tribello

Notice that some of the PLUMED modules are released under different
licenses. In each module with this exception, you should find a file
named COPYRIGHT stating the exact licence. Look for files
in the form src/*/COPYRIGHT

35 changes: 35 additions & 0 deletions src/molfile/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
University of Illinois Open Source License
Copyright 2003 Theoretical and Computational Biophysics Group,
All rights reserved.

Developed by: Theoretical and Computational Biophysics Group
University of Illinois at Urbana-Champaign
http://www.ks.uiuc.edu/

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the Software), to deal with
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to
do so, subject to the following conditions:

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.

Neither the names of Theoretical and Computational Biophysics Group,
University of Illinois at Urbana-Champaign, nor the names of its contributors
may be used to endorse or promote products derived from this Software without
specific prior written permission.

THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS WITH THE SOFTWARE.

1 change: 1 addition & 0 deletions src/molfile/import.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ for i in molfile_plugin.h vmdplugin.h; do
done

mycp $PD/molfile_plugin/LICENSE .
mycp $PD/molfile_plugin/LICENSE ./COPYRIGHT

# List of "known-good" plugins. Some renaming is necessary
mycp_wrap $IFDEF $PD/molfile_plugin/src/dcdplugin.c dcdplugin.cpp
Expand Down

0 comments on commit a78e1a0

Please sign in to comment.