From: Roland Mas Date: Fri, 14 Apr 2023 17:11:14 +0200 Subject: Backport license clarification This is straight from upstream, after a clarification request. https://github.com/bruceravel/demeter/commit/edfaa0904fa30426cf303b5933450edf22a426ec --- examples/cu/atoms.inp | 37 -------------------------------- examples/recipes/MixedShell/AgBr.inp | 38 --------------------------------- lib/Demeter/UI/Athena/share/logo.readme | 3 +-- 3 files changed, 1 insertion(+), 77 deletions(-) diff --git a/examples/cu/atoms.inp b/examples/cu/atoms.inp index f60073f..1475578 100644 --- a/examples/cu/atoms.inp +++ b/examples/cu/atoms.inp @@ -1,40 +1,3 @@ -% Copyright (c) 2000, 2008 Bruce Ravel -% Permission is granted to copy, distribute and/or modify this -% document under the terms of the GNU Free Documentation License, -% Version 1.0 or any later version published by the Free Software -% Foundation; with the Invariant Sections being "EXAFS Analysis -% Using FEFF and FEFFIT, Part 1: Presentation", "EXAFS Analysis -% Using FEFF and FEFFIT, Part 2: Commentary", and all related -% analysis examples, with no Front-Cover Texts, and with no -% Back-Cover Texts. A copy of the license is included in the -% section entitled "GNU Free Documentation License". -% -% -% This file (and all files associated with `EXAFS Analysis Using FEFF -% and FEFFIT') are free documentation; you can redistribute it and/or -% modify it under the terms of the GNU Free Documentation License as -% published by the Free Software Foundation; either version 2, or (at -% your option) any later version. -% -% You should have received a copy of the GNU Free Documentation License -% along with `EXAFS Analysis Using FEFF and FEFFIT'; see the file -% COPYING. If not, write to the Free Software Foundation, 675 -% Massachusettes Ave, Cambridge, MA 02139, USA. -% -% Permission is granted to make and distribute verbatim copies of this -% manual provided the copyright notice and this permission notice are -% preserved on all copies. -% -% Permission is granted to copy and distribute modified versions of this -% manual under the conditions for verbatim copying, provided that the -% entire resulting derived work is distributed under the terms of a -% permission notice identical to this one. -% -% Permission is granted to copy and distribute translations of this -% manual into another language, under the above conditions for modified -% versions, except that this permission notice may be stated in a -% translation approved by the author. - title = Copper example a = 3.61 core = Cu rmax = 6.5 space = fcc diff --git a/examples/recipes/MixedShell/AgBr.inp b/examples/recipes/MixedShell/AgBr.inp index 9aab8cf..fab190d 100644 --- a/examples/recipes/MixedShell/AgBr.inp +++ b/examples/recipes/MixedShell/AgBr.inp @@ -1,41 +1,3 @@ -% Copyright (c) 2000 Bruce Ravel -% Permission is granted to copy, distribute and/or modify this -% document under the terms of the GNU Free Documentation License, -% Version 1.0 or any later version published by the Free Software -% Foundation; with the Invariant Sections being "EXAFS Analysis -% Using FEFF and FEFFIT, Part 1: Presentation", "EXAFS Analysis -% Using FEFF and FEFFIT, Part 2: Commentary", and all related -% analysis examples, with no Front-Cover Texts, and with no -% Back-Cover Texts. A copy of the license is included in the -% section entitled "GNU Free Documentation License". -% -% -% This file (and all files associated with `EXAFS Analysis Using FEFF -% and FEFFIT') are free documentation; you can redistribute it and/or -% modify it under the terms of the GNU Free Documentation License as -% published by the Free Software Foundation; either version 1, or (at -% your option) any later version. -% -% You should have received a copy of the GNU Free Documentation License -% along with `EXAFS Analysis Using FEFF and FEFFIT'; see the file -% COPYING. If not, write to the Free Software Foundation, 675 -% Massachusettes Ave, Cambridge, MA 02139, USA. -% -% Permission is granted to make and distribute verbatim copies of this -% manual provided the copyright notice and this permission notice are -% preserved on all copies. -% -% Permission is granted to copy and distribute modified versions of this -% manual under the conditions for verbatim copying, provided that the -% entire resulting derived work is distributed under the terms of a -% permission notice identical to this one. -% -% Permission is granted to copy and distribute translations of this -% manual into another language, under the above conditions for modified -% versions, except that this permission notice may be stated in a -% translation approved by the author. - - title AgBr space f m 3 m a = 5.7745 diff --git a/lib/Demeter/UI/Athena/share/logo.readme b/lib/Demeter/UI/Athena/share/logo.readme index 93946d3..5ab7de1 100644 --- a/lib/Demeter/UI/Athena/share/logo.readme +++ b/lib/Demeter/UI/Athena/share/logo.readme @@ -17,8 +17,7 @@ Source Own work Author One dead president (http://commons.wikimedia.org/wiki/User:One_dead_president) -Permission The GNU Free Documentation License, Version 1.2 or any later version and - The Creative Commons Attribution-Share Alike 3.0 Unported, 2.5 Generic, +Permission The Creative Commons Attribution-Share Alike 3.0 Unported, 2.5 Generic, 2.0 Generic and 1.0 Generic license.