From e5f3f66b77c63cd3d250f27644217900a288bcda Mon Sep 17 00:00:00 2001 From: Saku Hakamaa <sajuhak@utu.fi> Date: Thu, 7 Dec 2017 09:49:26 +0200 Subject: [PATCH] clean up license --- LICENSE | 55 ---------------------------------- ase_sim.py | 2 +- ovito_overlay.py | 2 +- sajuhak_dyn.py | 2 +- sim_controller.py | 2 +- single_xyz_anim_to_multiple.py | 2 +- vis.py | 2 +- 7 files changed, 6 insertions(+), 61 deletions(-) diff --git a/LICENSE b/LICENSE index d76e52a..bc08fe2 100644 --- a/LICENSE +++ b/LICENSE @@ -617,58 +617,3 @@ reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - oxidation_sim - Copyright (C) 2017 Saku Hakamaa - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - oxidation_sim Copyright (C) 2017 Saku Hakamaa - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -<http://www.gnu.org/licenses/>. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -<http://www.gnu.org/philosophy/why-not-lgpl.html>. diff --git a/ase_sim.py b/ase_sim.py index 9fad4a1..4e2e273 100644 --- a/ase_sim.py +++ b/ase_sim.py @@ -1,7 +1,7 @@ # coding=utf-8 # ------------------------------ # oxidation_sim: Simulation of the oxidation of Fe-Cr-Al surfaces using semiclassical methods -# Copyright (C) 2017 Saku Hakamaa +# Copyright (C) 2017 Saku Hakamaa, sajuhak@utu.fi # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/ovito_overlay.py b/ovito_overlay.py index 01d3e13..c82ec03 100644 --- a/ovito_overlay.py +++ b/ovito_overlay.py @@ -1,7 +1,7 @@ # coding=utf-8 # ------------------------------ # oxidation_sim: Simulation of the oxidation of Fe-Cr-Al surfaces using semiclassical methods -# Copyright (C) 2017 Saku Hakamaa +# Copyright (C) 2017 Saku Hakamaa, sajuhak@utu.fi # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/sajuhak_dyn.py b/sajuhak_dyn.py index 37fedd0..8604525 100644 --- a/sajuhak_dyn.py +++ b/sajuhak_dyn.py @@ -1,7 +1,7 @@ # coding=utf-8 # ------------------------------ # oxidation_sim: Simulation of the oxidation of Fe-Cr-Al surfaces using semiclassical methods -# Copyright (C) 2017 Saku Hakamaa +# Copyright (C) 2017 Saku Hakamaa, sajuhak@utu.fi # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/sim_controller.py b/sim_controller.py index f6dfd4f..bde6a07 100644 --- a/sim_controller.py +++ b/sim_controller.py @@ -1,7 +1,7 @@ # coding=utf-8 # ------------------------------ # oxidation_sim: Simulation of the oxidation of Fe-Cr-Al surfaces using semiclassical methods -# Copyright (C) 2017 Saku Hakamaa +# Copyright (C) 2017 Saku Hakamaa, sajuhak@utu.fi # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/single_xyz_anim_to_multiple.py b/single_xyz_anim_to_multiple.py index a4b6eba..466eaca 100644 --- a/single_xyz_anim_to_multiple.py +++ b/single_xyz_anim_to_multiple.py @@ -1,7 +1,7 @@ # coding=utf-8 # ------------------------------ # oxidation_sim: Simulation of the oxidation of Fe-Cr-Al surfaces using semiclassical methods -# Copyright (C) 2017 Saku Hakamaa +# Copyright (C) 2017 Saku Hakamaa, sajuhak@utu.fi # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/vis.py b/vis.py index cc1a1d8..509ee21 100644 --- a/vis.py +++ b/vis.py @@ -1,7 +1,7 @@ # coding=utf-8 # ------------------------------ # oxidation_sim: Simulation of the oxidation of Fe-Cr-Al surfaces using semiclassical methods -# Copyright (C) 2017 Saku Hakamaa +# Copyright (C) 2017 Saku Hakamaa, sajuhak@utu.fi # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -- GitLab