From 78d05d9422ddfbfe2f0f8f2c809841a4096921f0 Mon Sep 17 00:00:00 2001 From: Philip Orr Date: Mon, 17 Jul 2023 13:52:36 +0000 Subject: [PATCH] Bug 29324: Changed patch to correct copyright This changes the previous patch to add the correct copyright and license statements to various files that didn't contain them. To test: 1. Before applying the patch, run find-license-problems.t from the root of your Koha src directory: $ perl xt/find-license-problems.t 2. Observe that 14 tests fail. 3. Apply the patch. 4. Run the test again 5. Observe that no tests fail. --- Koha/Course.pm | 7 ++++--- Koha/Course/Instructor.pm | 7 ++++--- Koha/Course/Instructors.pm | 7 ++++--- Koha/Course/Item.pm | 7 ++++--- Koha/Course/Items.pm | 7 ++++--- Koha/Course/Reserve.pm | 7 ++++--- Koha/Course/Reserves.pm | 7 ++++--- Koha/Courses.pm | 7 ++++--- Koha/Exceptions/MarcOverlayRule.pm | 7 ++++--- Koha/REST/V1/CirculationRules.pm | 7 ++++--- Koha/REST/V1/Illbackends.pm | 7 ++++--- Koha/REST/V1/Suggestions.pm | 4 +++- misc/translator/tmpl_process3.pl | 13 +++++++++++++ reports/orders_by_fund.pl | 7 ++++--- 14 files changed, 64 insertions(+), 37 deletions(-) diff --git a/Koha/Course.pm b/Koha/Course.pm index 9ede81bd3c..647ccf5eda 100644 --- a/Koha/Course.pm +++ b/Koha/Course.pm @@ -2,6 +2,8 @@ package Koha::Course; # This file is part of Koha. # +# Copyright 2023 Koha Development Team +# # Koha 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 @@ -11,9 +13,8 @@ package Koha::Course; # 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 Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . use Modern::Perl; diff --git a/Koha/Course/Instructor.pm b/Koha/Course/Instructor.pm index e6c4db9739..0c1ec36c76 100644 --- a/Koha/Course/Instructor.pm +++ b/Koha/Course/Instructor.pm @@ -2,6 +2,8 @@ package Koha::Course::Instructor; # This file is part of Koha. # +# Copyright 2023 Koha Development Team +# # Koha 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 @@ -11,9 +13,8 @@ package Koha::Course::Instructor; # 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 Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . use Modern::Perl; diff --git a/Koha/Course/Instructors.pm b/Koha/Course/Instructors.pm index f69dd48ca0..949342e9be 100644 --- a/Koha/Course/Instructors.pm +++ b/Koha/Course/Instructors.pm @@ -2,6 +2,8 @@ package Koha::Course::Instructors; # This file is part of Koha. # +# Copyright 2023 Koha Development Team +# # Koha 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 @@ -11,9 +13,8 @@ package Koha::Course::Instructors; # 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 Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . use Modern::Perl; diff --git a/Koha/Course/Item.pm b/Koha/Course/Item.pm index d55382c7a2..17333e9530 100644 --- a/Koha/Course/Item.pm +++ b/Koha/Course/Item.pm @@ -2,6 +2,8 @@ package Koha::Course::Item; # This file is part of Koha. # +# Copyright 2023 Koha Development Team +# # Koha 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 @@ -11,9 +13,8 @@ package Koha::Course::Item; # 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 Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . use Modern::Perl; diff --git a/Koha/Course/Items.pm b/Koha/Course/Items.pm index 9076540c7a..d9ddad670f 100644 --- a/Koha/Course/Items.pm +++ b/Koha/Course/Items.pm @@ -2,6 +2,8 @@ package Koha::Course::Items; # This file is part of Koha. # +# Copyright 2023 Koha Development Team +# # Koha 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 @@ -11,9 +13,8 @@ package Koha::Course::Items; # 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 Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . use Modern::Perl; diff --git a/Koha/Course/Reserve.pm b/Koha/Course/Reserve.pm index 963a2ee272..dc013e7558 100644 --- a/Koha/Course/Reserve.pm +++ b/Koha/Course/Reserve.pm @@ -2,6 +2,8 @@ package Koha::Course::Reserve; # This file is part of Koha. # +# Copyright 2023 Koha Development Team +# # Koha 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 @@ -11,9 +13,8 @@ package Koha::Course::Reserve; # 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 Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . use Modern::Perl; diff --git a/Koha/Course/Reserves.pm b/Koha/Course/Reserves.pm index e96cee6316..518a18967e 100644 --- a/Koha/Course/Reserves.pm +++ b/Koha/Course/Reserves.pm @@ -2,6 +2,8 @@ package Koha::Course::Reserves; # This file is part of Koha. # +# Copyright 2023 Koha Development Team +# # Koha 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 @@ -11,9 +13,8 @@ package Koha::Course::Reserves; # 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 Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . use Modern::Perl; diff --git a/Koha/Courses.pm b/Koha/Courses.pm index df2a74163e..62711adbf2 100644 --- a/Koha/Courses.pm +++ b/Koha/Courses.pm @@ -2,6 +2,8 @@ package Koha::Courses; # This file is part of Koha. # +# Copyright 2023 Koha Development Team +# # Koha 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 @@ -11,9 +13,8 @@ package Koha::Courses; # 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 Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . use Modern::Perl; diff --git a/Koha/Exceptions/MarcOverlayRule.pm b/Koha/Exceptions/MarcOverlayRule.pm index 3b69916e4c..676fb606a7 100644 --- a/Koha/Exceptions/MarcOverlayRule.pm +++ b/Koha/Exceptions/MarcOverlayRule.pm @@ -2,6 +2,8 @@ package Koha::Exceptions::MarcOverlayRule; # This file is part of Koha. # +# Copyright 2023 Koha Development Team +# # Koha 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 @@ -11,9 +13,8 @@ package Koha::Exceptions::MarcOverlayRule; # 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 Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . use Modern::Perl; diff --git a/Koha/REST/V1/CirculationRules.pm b/Koha/REST/V1/CirculationRules.pm index 636985fba6..67d8243fe9 100644 --- a/Koha/REST/V1/CirculationRules.pm +++ b/Koha/REST/V1/CirculationRules.pm @@ -2,6 +2,8 @@ package Koha::REST::V1::CirculationRules; # This file is part of Koha. # +# Copyright 2023 Koha Development Team +# # Koha 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 @@ -11,9 +13,8 @@ package Koha::REST::V1::CirculationRules; # 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 Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . use Modern::Perl; diff --git a/Koha/REST/V1/Illbackends.pm b/Koha/REST/V1/Illbackends.pm index 02096db565..f8604c806c 100644 --- a/Koha/REST/V1/Illbackends.pm +++ b/Koha/REST/V1/Illbackends.pm @@ -2,6 +2,8 @@ package Koha::REST::V1::Illbackends; # This file is part of Koha. # +# Copyright 2023 Koha Development Team +# # Koha 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 @@ -11,9 +13,8 @@ package Koha::REST::V1::Illbackends; # 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 Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . use Modern::Perl; diff --git a/Koha/REST/V1/Suggestions.pm b/Koha/REST/V1/Suggestions.pm index 4bc27709d1..1fdd6ff31f 100644 --- a/Koha/REST/V1/Suggestions.pm +++ b/Koha/REST/V1/Suggestions.pm @@ -2,6 +2,8 @@ package Koha::REST::V1::Suggestions; # This file is part of Koha. # +# Copyright 2023 Koha Development Team +# # Koha 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 @@ -12,7 +14,7 @@ package Koha::REST::V1::Suggestions; # 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 Koha; if not, see . +# along with Koha; if not, see . use Modern::Perl; diff --git a/misc/translator/tmpl_process3.pl b/misc/translator/tmpl_process3.pl index ddb02e7957..ce7f086ea4 100755 --- a/misc/translator/tmpl_process3.pl +++ b/misc/translator/tmpl_process3.pl @@ -1,8 +1,21 @@ #!/usr/bin/perl # This file is part of Koha +# # Parts copyright 2003-2004 Paul Poulain # Parts copyright 2003-2004 Jerome Vizcaino # Parts copyright 2004 Ambrose Li +# +# Koha 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. +# +# Koha 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 Koha; if not, see . use FindBin; use lib $FindBin::Bin; diff --git a/reports/orders_by_fund.pl b/reports/orders_by_fund.pl index c831bf2044..c54a6b5f39 100755 --- a/reports/orders_by_fund.pl +++ b/reports/orders_by_fund.pl @@ -2,6 +2,8 @@ # This file is part of Koha. # +# Copyright 2023 Koha Development Team +# # Author : Frédérick Capovilla, 2011 - SYS-TECH # Modified by : Élyse Morin, 2012 - Libéo # @@ -14,9 +16,8 @@ # 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 -# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . =head1 orders_by_budget -- 2.30.2