From 0cbd2243458611caa2a3564b577987531bcd6934 Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Sat, 13 Apr 2019 23:43:07 +0100 Subject: Corrected copyright notices and info about adding copyright info Until now, the files where the people were meant to change didn't have a proper copyright notice (for example `Copyright (C) YOUR NAME.'). This was wrong because the license does not convey copyright ownership. So the name of the file's original author must always be included and when people modify it (and add their own copyright-able modifications). With this commit, the file's original author (and email) are added to the copyright notice and when more than one person modified a file, both names have their individual copyright notice. Based on this, the description for adding a copyright notice in `README-hacking.md' has also been modified. --- reproduce/config/gnuastro/astbuildprog.conf | 2 +- reproduce/config/gnuastro/astconvertt.conf | 2 +- reproduce/config/gnuastro/aststatistics.conf | 2 +- reproduce/config/gnuastro/gnuastro.conf | 2 +- reproduce/config/pipeline/INPUTS.mk | 2 +- reproduce/config/pipeline/LOCAL.mk.in | 2 +- .../config/pipeline/dependency-numpy-scipy.cfg | 2 +- reproduce/config/pipeline/dependency-texlive.mk | 2 +- reproduce/config/pipeline/dependency-versions.mk | 7 ++--- reproduce/config/pipeline/pdf-build.mk | 2 +- reproduce/config/pipeline/texlive.conf | 2 +- reproduce/src/bash/download-multi-try | 5 +--- reproduce/src/bash/git-post-checkout | 23 ++++++++++++++- reproduce/src/bash/git-pre-commit | 34 +++++++++++++++++----- reproduce/src/make/delete-me.mk | 5 +--- reproduce/src/make/dependencies-atlas-multiple.mk | 6 +--- reproduce/src/make/dependencies-atlas-single.mk | 6 +--- reproduce/src/make/dependencies-basic.mk | 6 +--- reproduce/src/make/dependencies-build-rules.mk | 6 +--- reproduce/src/make/dependencies-python.mk | 7 ++--- reproduce/src/make/dependencies.mk | 6 +--- reproduce/src/make/download.mk | 6 +--- reproduce/src/make/initialize.mk | 6 +--- reproduce/src/make/paper.mk | 6 +--- reproduce/src/make/top.mk | 6 +--- 25 files changed, 74 insertions(+), 81 deletions(-) (limited to 'reproduce') diff --git a/reproduce/config/gnuastro/astbuildprog.conf b/reproduce/config/gnuastro/astbuildprog.conf index 6feb1ac..c15baf1 100644 --- a/reproduce/config/gnuastro/astbuildprog.conf +++ b/reproduce/config/gnuastro/astbuildprog.conf @@ -2,7 +2,7 @@ # along with the rest of Gnuastro. So we'll set any specific configuration # we want here, then import those. # -# Copyright (C) 2018-2019 Mohammad Akhlaghi. +# Copyright (C) 2018-2019 Mohammad Akhlaghi # # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice and diff --git a/reproduce/config/gnuastro/astconvertt.conf b/reproduce/config/gnuastro/astconvertt.conf index 6558edd..6466455 100644 --- a/reproduce/config/gnuastro/astconvertt.conf +++ b/reproduce/config/gnuastro/astconvertt.conf @@ -12,7 +12,7 @@ # $ info astconvertt # All options and input/output. # $ info gnuastro "Configuration files" # How to use configuration files. # -# Copyright (C) 2018-2019 Mohammad Akhlaghi. +# Copyright (C) 2018-2019 Mohammad Akhlaghi # # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice and diff --git a/reproduce/config/gnuastro/aststatistics.conf b/reproduce/config/gnuastro/aststatistics.conf index 3ace941..1d13e3f 100644 --- a/reproduce/config/gnuastro/aststatistics.conf +++ b/reproduce/config/gnuastro/aststatistics.conf @@ -12,7 +12,7 @@ # $ info aststatistics # All options and input/output. # $ info gnuastro "Configuration files" # How to use configuration files. # -# Copyright (C) 2018-2019 Mohammad Akhlaghi. +# Copyright (C) 2018-2019 Mohammad Akhlaghi # # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice and diff --git a/reproduce/config/gnuastro/gnuastro.conf b/reproduce/config/gnuastro/gnuastro.conf index 3d53e06..fbdfa37 100644 --- a/reproduce/config/gnuastro/gnuastro.conf +++ b/reproduce/config/gnuastro/gnuastro.conf @@ -10,7 +10,7 @@ # pipeline is taken from the default Gnuastro configuration from its # source (`bin/gnuastro.conf'). # -# Copyright (C) 2018-2019 Mohammad Akhlaghi. +# Copyright (C) 2018-2019 Mohammad Akhlaghi # # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice and diff --git a/reproduce/config/pipeline/INPUTS.mk b/reproduce/config/pipeline/INPUTS.mk index 7f5a4c1..dbcb5fe 100644 --- a/reproduce/config/pipeline/INPUTS.mk +++ b/reproduce/config/pipeline/INPUTS.mk @@ -2,7 +2,7 @@ # # This file is read by the configure script and running Makefiles. # -# Copyright (C) 2018-2019 Mohammad Akhlaghi. +# Copyright (C) 2018-2019 Mohammad Akhlaghi # # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice and diff --git a/reproduce/config/pipeline/LOCAL.mk.in b/reproduce/config/pipeline/LOCAL.mk.in index b986520..7de88d3 100644 --- a/reproduce/config/pipeline/LOCAL.mk.in +++ b/reproduce/config/pipeline/LOCAL.mk.in @@ -3,7 +3,7 @@ # This is just a template for the `./configure' script to fill in. Please # don't make any change to this file. # -# Copyright (C) 2018-2019 Mohammad Akhlaghi. +# Copyright (C) 2018-2019 Mohammad Akhlaghi # # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice and diff --git a/reproduce/config/pipeline/dependency-numpy-scipy.cfg b/reproduce/config/pipeline/dependency-numpy-scipy.cfg index d250b5b..7590427 100644 --- a/reproduce/config/pipeline/dependency-numpy-scipy.cfg +++ b/reproduce/config/pipeline/dependency-numpy-scipy.cfg @@ -7,7 +7,7 @@ # appropriate sections. Not all packages will use all sections so you # should leave out sections that your package does not use. # -# Copyright (C) 2018-2019 Mohammad Akhlaghi. +# Copyright (C) 2018-2019 Mohammad Akhlaghi # # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice and diff --git a/reproduce/config/pipeline/dependency-texlive.mk b/reproduce/config/pipeline/dependency-texlive.mk index 0e3b4ff..0acf5ab 100644 --- a/reproduce/config/pipeline/dependency-texlive.mk +++ b/reproduce/config/pipeline/dependency-texlive.mk @@ -4,7 +4,7 @@ # name to this variable (you can check in `ctan.org' to find the official # name). # -# Copyright (C) 2018-2019 Mohammad Akhlaghi. +# Copyright (C) 2018-2019 Mohammad Akhlaghi # # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice and diff --git a/reproduce/config/pipeline/dependency-versions.mk b/reproduce/config/pipeline/dependency-versions.mk index 91d1265..c6c8043 100644 --- a/reproduce/config/pipeline/dependency-versions.mk +++ b/reproduce/config/pipeline/dependency-versions.mk @@ -1,10 +1,7 @@ # Versions of the various dependencies # -# Original author: -# Mohammad Akhlaghi -# Contributing author(s): -# Raul Infante-Sainz -# Copyright (C) 2018-2019, Your Name. +# Copyright (C) 2018-2019 Mohammad Akhlaghi +# Copyright (C) 2019 Raul Infante-Sainz # # This Makefile is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/reproduce/config/pipeline/pdf-build.mk b/reproduce/config/pipeline/pdf-build.mk index ccf9f64..02af72d 100644 --- a/reproduce/config/pipeline/pdf-build.mk +++ b/reproduce/config/pipeline/pdf-build.mk @@ -12,7 +12,7 @@ # LaTeX. Otherwise, a notice will just printed that for now, no PDF will be # created. # -# Copyright (C) 2018-2019 Mohammad Akhlaghi. +# Copyright (C) 2018-2019 Mohammad Akhlaghi # # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice and diff --git a/reproduce/config/pipeline/texlive.conf b/reproduce/config/pipeline/texlive.conf index 0010c70..8a9fb8e 100644 --- a/reproduce/config/pipeline/texlive.conf +++ b/reproduce/config/pipeline/texlive.conf @@ -3,7 +3,7 @@ # installdir: Install directory # topdir: Top pipeline directory # -# Copyright (C) 2018-2019 Mohammad Akhlaghi. +# Copyright (C) 2018-2019 Mohammad Akhlaghi # # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice and diff --git a/reproduce/src/bash/download-multi-try b/reproduce/src/bash/download-multi-try index cdeca8e..2399b5d 100755 --- a/reproduce/src/bash/download-multi-try +++ b/reproduce/src/bash/download-multi-try @@ -22,10 +22,7 @@ # benefit from it, any call to this script must be given the same lock # file. # -# Original author: -# Mohammad Akhlaghi -# Contributing author(s): -# Copyright (C) 2019, Mohammad Akhlaghi. +# Copyright (C) 2019 Mohammad Akhlaghi # # This script is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/reproduce/src/bash/git-post-checkout b/reproduce/src/bash/git-post-checkout index 12fbc9c..ef85c44 100644 --- a/reproduce/src/bash/git-post-checkout +++ b/reproduce/src/bash/git-post-checkout @@ -3,13 +3,34 @@ # The example hook script to store the metadata information of version # controlled files (with each commit) using the `metastore' program. # -# Copyright (C) 2018-2019 Mohammad Akhlaghi. +# Copyright (C) 2016 Przemyslaw Pawelczyk +# Copyright (C) 2018-2019 Mohammad Akhlaghi # # This script is taken from the `examples/hooks/pre-commit' file of the # `metastore' package (installed within the pipeline, with an MIT license # for copyright). We have just changed the name of the `MSFILE' and also # set special characters for the installation location of meta-store so our # own installation is found by Git. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the +# "Software"), to deal in 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: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# 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 AUTHORS 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 IN THE SOFTWARE. + # File containig the metadata and metastore executable. MSFILE=".file-metadata" diff --git a/reproduce/src/bash/git-pre-commit b/reproduce/src/bash/git-pre-commit index 424df04..09abce7 100644 --- a/reproduce/src/bash/git-pre-commit +++ b/reproduce/src/bash/git-pre-commit @@ -3,13 +3,8 @@ # The example hook script to store the metadata information of version # controlled files (with each commit) using the `metastore' program. # -# Copyright (C) 2018-2019 Mohammad Akhlaghi. -# -# This script is taken from the `examples/hooks/pre-commit' file of the -# `metastore' package (installed within the pipeline, with an MIT license -# for copyright). We have just changed the name of the `MSFILE' and also -# set special characters for the installation location of meta-store so our -# own installation is found by Git. +# Copyright (C) 2016 Przemyslaw Pawelczyk +# Copyright (C) 2018-2019 Mohammad Akhlaghi # # WARNING: # @@ -21,6 +16,31 @@ # # git reset HEAD -- .metadata # git checkout HEAD -- .metadata +# +# This script is taken from the `examples/hooks/pre-commit' file of the +# `metastore' package (installed within the pipeline, with an MIT license +# for copyright). Here, the name of the `MSFILE' and also set special +# characters for the installation location of meta-store so our own +# installation is found by Git. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the +# "Software"), to deal in 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: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# 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 AUTHORS 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 IN THE SOFTWARE. # File containig the metadata and metastore executable. MSFILE=".file-metadata" diff --git a/reproduce/src/make/delete-me.mk b/reproduce/src/make/delete-me.mk index 2d93566..701a316 100644 --- a/reproduce/src/make/delete-me.mk +++ b/reproduce/src/make/delete-me.mk @@ -1,9 +1,6 @@ # Dummy Makefile to create a random dataset for plotting. # -# Original author: -# Mohammad Akhlaghi -# Contributing author(s): -# Copyright (C) 2018-2019, Your Name. +# Copyright (C) 2018-2019 Mohammad Akhlaghi # # This Makefile is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/reproduce/src/make/dependencies-atlas-multiple.mk b/reproduce/src/make/dependencies-atlas-multiple.mk index e23a6b8..fef25c7 100755 --- a/reproduce/src/make/dependencies-atlas-multiple.mk +++ b/reproduce/src/make/dependencies-atlas-multiple.mk @@ -8,11 +8,7 @@ # # ------------------------------------------------------------------------ # -# Original author: -# Mohammad Akhlaghi -# Contributing author(s): -# Your name -# Copyright (C) 2019, Your Name. +# Copyright (C) 2019 Mohammad Akhlaghi # # This Makefile is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/reproduce/src/make/dependencies-atlas-single.mk b/reproduce/src/make/dependencies-atlas-single.mk index 6f78f6d..dde2926 100755 --- a/reproduce/src/make/dependencies-atlas-single.mk +++ b/reproduce/src/make/dependencies-atlas-single.mk @@ -8,11 +8,7 @@ # # ------------------------------------------------------------------------ # -# Original author: -# Mohammad Akhlaghi -# Contributing author(s): -# Your name -# Copyright (C) 2019, Your Name. +# Copyright (C) 2019 Mohammad Akhlaghi # # This Makefile is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/reproduce/src/make/dependencies-basic.mk b/reproduce/src/make/dependencies-basic.mk index 81a17cd..e3a5ab3 100644 --- a/reproduce/src/make/dependencies-basic.mk +++ b/reproduce/src/make/dependencies-basic.mk @@ -18,11 +18,7 @@ # # ------------------------------------------------------------------------ # -# Original author: -# Mohammad Akhlaghi -# Contributing author(s): -# Your name -# Copyright (C) 2018-2019, Your Name. +# Copyright (C) 2018-2019 Mohammad Akhlaghi # # This Makefile is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/reproduce/src/make/dependencies-build-rules.mk b/reproduce/src/make/dependencies-build-rules.mk index 5216488..2523f6a 100644 --- a/reproduce/src/make/dependencies-build-rules.mk +++ b/reproduce/src/make/dependencies-build-rules.mk @@ -3,11 +3,7 @@ # imported into `dependencies-basic.mk' and `dependencies.mk'. They should # be activated with Make's `Call' function. # -# Original author: -# Mohammad Akhlaghi -# Contributing author(s): -# Your name -# Copyright (C) 2018-2019, Your Name. +# Copyright (C) 2018-2019 Mohammad Akhlaghi # # This Makefile is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/reproduce/src/make/dependencies-python.mk b/reproduce/src/make/dependencies-python.mk index 7ccf6b3..ce1cd38 100644 --- a/reproduce/src/make/dependencies-python.mk +++ b/reproduce/src/make/dependencies-python.mk @@ -8,11 +8,8 @@ # # ------------------------------------------------------------------------ # -# Original author: -# Raul Infante-Sainz -# Contributing author(s): -# Mohammad Akhlaghi -# Copyright (C) 2019, Your Name. +# Copyright (C) 2019 Raul Infante-Sainz +# Copyright (C) 2019 Mohammad Akhlaghi # # This Makefile is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/reproduce/src/make/dependencies.mk b/reproduce/src/make/dependencies.mk index 67ce490..c237313 100644 --- a/reproduce/src/make/dependencies.mk +++ b/reproduce/src/make/dependencies.mk @@ -8,11 +8,7 @@ # # ------------------------------------------------------------------------ # -# Original author: -# Mohammad Akhlaghi -# Contributing author(s): -# Your name -# Copyright (C) 2018-2019, Your Name. +# Copyright (C) 2018-2019 Mohammad Akhlaghi # # This Makefile is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/reproduce/src/make/download.mk b/reproduce/src/make/download.mk index 036332b..28ee5ff 100644 --- a/reproduce/src/make/download.mk +++ b/reproduce/src/make/download.mk @@ -5,11 +5,7 @@ # recipes in this Makefile all use a single file lock to have one download # script running at every instant. # -# Original author: -# Mohammad Akhlaghi -# Contributing author(s): -# Your name -# Copyright (C) 2018-2019, Your Name. +# Copyright (C) 2018-2019 Mohammad Akhlaghi # # This Makefile is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/reproduce/src/make/initialize.mk b/reproduce/src/make/initialize.mk index 4e59712..f9e054f 100644 --- a/reproduce/src/make/initialize.mk +++ b/reproduce/src/make/initialize.mk @@ -1,10 +1,6 @@ # Initialize the reproduction pipeline. # -# Original author: -# Mohammad Akhlaghi -# Contributing author(s): -# Your name -# Copyright (C) 2018-2019, Your Name. +# Copyright (C) 2018-2019 Mohammad Akhlaghi # # This Makefile is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/reproduce/src/make/paper.mk b/reproduce/src/make/paper.mk index d148c08..86cf114 100644 --- a/reproduce/src/make/paper.mk +++ b/reproduce/src/make/paper.mk @@ -1,10 +1,6 @@ # Build the final PDF paper/report. # -# Original author: -# Mohammad Akhlaghi -# Contributing author(s): -# Your name -# Copyright (C) 2018-2019, Your Name. +# Copyright (C) 2018-2019 Mohammad Akhlaghi # # This Makefile is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/reproduce/src/make/top.mk b/reproduce/src/make/top.mk index 9b81a58..14bdbf3 100644 --- a/reproduce/src/make/top.mk +++ b/reproduce/src/make/top.mk @@ -1,10 +1,6 @@ # A ONE-LINE DESCRIPTION OF THE WHOLE PIPELINE # -# Original author: -# Mohammad Akhlaghi -# Contributing author(s): -# Your name -# Copyright (C) 2018-2019, Your Name. +# Copyright (C) 2018-2019 Mohammad Akhlaghi # # This Makefile is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the -- cgit v1.2.1