D27363: KHolidays: Convert license statements to SPDX expressions
This revision was automatically updated to reflect the committed changes. Closed by commit R175:1bc908a8cfea: KHolidays: Convert license statements to SPDX expressions (authored by cordlandwehr). REPOSITORY R175 KHolidays CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D27363?vs=76151=76482 REVISION DETAIL https://phabricator.kde.org/D27363 AFFECTED FILES LICENSES/BSD-2-Clause.txt LICENSES/Bison-exception-2.2.txt LICENSES/GPL-3.0-or-later.txt LICENSES/LGPL-2.0-or-later.txt autotests/testholidayregion.cpp autotests/testholidayregion.h autotests/testlunar.cpp autotests/testlunar.h autotests/testseasons.cpp autotests/testseasons.h autotests/testsunriseset.cpp autotests/testsunriseset.h autotests/testzodiac.cpp src/astroseasons.cpp src/astroseasons.h src/declarative/holidayregionsmodel.cpp src/declarative/holidayregionsmodel.h src/declarative/kholidaysdeclarativeplugin.cpp src/declarative/kholidaysdeclarativeplugin.h src/holiday.cpp src/holiday.h src/holiday_p.h src/holidayregion.cpp src/holidayregion.h src/lunarphase.cpp src/lunarphase.h src/parsers/holidayparserdriver.cpp src/parsers/holidayparserdriver_p.h src/parsers/plan2/FlexLexer.h src/parsers/plan2/holidayparserdriverplan.cpp src/parsers/plan2/holidayparserdriverplan_p.h src/parsers/plan2/holidayparserplan.cpp src/parsers/plan2/holidayparserplan.hpp src/parsers/plan2/holidayparserplan.ypp src/parsers/plan2/holidayscannerplan.cpp src/parsers/plan2/holidayscannerplan.lpp src/parsers/plan2/holidayscannerplan_p.h src/parsers/plan2/location.hh src/parsers/plan2/position.hh src/parsers/plan2/stack.hh src/parsers/qcalendarsystem.cpp src/parsers/qcalendarsystem_p.h src/sunriseset.cpp src/sunriseset.h src/zodiac.cpp src/zodiac.h To: cordlandwehr, winterz Cc: cgiboudeaux, winterz, kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, ngraham, bruns
D27363: KHolidays: Convert license statements to SPDX expressions
winterz accepted this revision. This revision is now accepted and ready to land. REPOSITORY R175 KHolidays BRANCH spdx REVISION DETAIL https://phabricator.kde.org/D27363 To: cordlandwehr, winterz Cc: cgiboudeaux, winterz, kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, ngraham, bruns
D27363: KHolidays: Convert license statements to SPDX expressions
cordlandwehr marked 3 inline comments as done. cordlandwehr added a comment. Did additional code digging in the Plan repository and I think that all stated copyright claims are valid. INLINE COMMENTS > cgiboudeaux wrote in holidayparserdriverplan.cpp:6-13 > The original text lacks clarity. Are these file contributors or copyright > holders? @winterz the original code comes from Plan's holiday.c - original author has obvious claim, since important code fragments remain - additional code contributors are listed in original source for contribution specific functions each, thus have also a valid copyright claim > cgiboudeaux wrote in holidayparserplan.ypp:3-10 > same question for this file analyzed code history: - original file comes from Plan's parser.y by Thomas Driemeyer - IMO the changes for integrating into KOrganizer are above the limit of copyright, so I would (in case of doubt) prefer to state copyright explicitly - the individual conversion commits are unfortunately buried deep in the disabled Reviewboard > cordlandwehr wrote in holidayscannerplan.cpp:1297-1301 > @winterz same question here as above: are these people copyright holders or > file contributors? this copyright statement comes from the .lpp file; thus to be discussed in that statement > holidayscannerplan.lpp:2 > /* > -Original version from plan by Thomas Driemeyer > +Original version from plan: > +SPDX-FileCopyrightText: Thomas Driemeyer analyzed the code history of this file: - original copyright claim comes from Plan's parser.lex file - the code was massively changed and rewritten, thus IMO all three additional claims to the original author are valid IMO. REPOSITORY R175 KHolidays REVISION DETAIL https://phabricator.kde.org/D27363 To: cordlandwehr Cc: cgiboudeaux, winterz, kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, ngraham, bruns
D27363: KHolidays: Convert license statements to SPDX expressions
cordlandwehr marked 2 inline comments as done. REPOSITORY R175 KHolidays REVISION DETAIL https://phabricator.kde.org/D27363 To: cordlandwehr Cc: cgiboudeaux, winterz, kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, ngraham, bruns
D27363: KHolidays: Convert license statements to SPDX expressions
cordlandwehr updated this revision to Diff 76151. cordlandwehr marked 2 inline comments as done. cordlandwehr added a comment. Add missing SPDX identifier REPOSITORY R175 KHolidays CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D27363?vs=75737=76151 BRANCH spdx REVISION DETAIL https://phabricator.kde.org/D27363 AFFECTED FILES LICENSES/BSD-2-Clause.txt LICENSES/Bison-exception-2.2.txt LICENSES/GPL-3.0-or-later.txt LICENSES/LGPL-2.0-or-later.txt autotests/testholidayregion.cpp autotests/testholidayregion.h autotests/testlunar.cpp autotests/testlunar.h autotests/testseasons.cpp autotests/testseasons.h autotests/testsunriseset.cpp autotests/testsunriseset.h autotests/testzodiac.cpp src/astroseasons.cpp src/astroseasons.h src/declarative/holidayregionsmodel.cpp src/declarative/holidayregionsmodel.h src/declarative/kholidaysdeclarativeplugin.cpp src/declarative/kholidaysdeclarativeplugin.h src/holiday.cpp src/holiday.h src/holiday_p.h src/holidayregion.cpp src/holidayregion.h src/lunarphase.cpp src/lunarphase.h src/parsers/holidayparserdriver.cpp src/parsers/holidayparserdriver_p.h src/parsers/plan2/FlexLexer.h src/parsers/plan2/holidayparserdriverplan.cpp src/parsers/plan2/holidayparserdriverplan_p.h src/parsers/plan2/holidayparserplan.cpp src/parsers/plan2/holidayparserplan.hpp src/parsers/plan2/holidayparserplan.ypp src/parsers/plan2/holidayscannerplan.cpp src/parsers/plan2/holidayscannerplan.lpp src/parsers/plan2/holidayscannerplan_p.h src/parsers/plan2/location.hh src/parsers/plan2/position.hh src/parsers/plan2/stack.hh src/parsers/qcalendarsystem.cpp src/parsers/qcalendarsystem_p.h src/sunriseset.cpp src/sunriseset.h src/zodiac.cpp src/zodiac.h To: cordlandwehr Cc: cgiboudeaux, winterz, kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, ngraham, bruns
D27363: KHolidays: Convert license statements to SPDX expressions
winterz added a comment. looks ok to me. INLINE COMMENTS > cgiboudeaux wrote in lunarphase.cpp:6 > This looks suspicious > > @winterz ? no, it's fine. REPOSITORY R175 KHolidays REVISION DETAIL https://phabricator.kde.org/D27363 To: cordlandwehr Cc: cgiboudeaux, winterz, kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, ngraham, bruns
D27363: KHolidays: Convert license statements to SPDX expressions
cordlandwehr updated this revision to Diff 75737. cordlandwehr marked 2 inline comments as done. cordlandwehr added a comment. Make snippet copyright statement more verbose REPOSITORY R175 KHolidays CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D27363?vs=75736=75737 BRANCH spdx REVISION DETAIL https://phabricator.kde.org/D27363 AFFECTED FILES LICENSES/BSD-2-Clause.txt LICENSES/Bison-exception-2.2.txt LICENSES/GPL-3.0-or-later.txt LICENSES/LGPL-2.0-or-later.txt autotests/testholidayregion.cpp autotests/testholidayregion.h autotests/testlunar.cpp autotests/testlunar.h autotests/testseasons.cpp autotests/testseasons.h autotests/testsunriseset.cpp autotests/testsunriseset.h autotests/testzodiac.cpp src/astroseasons.cpp src/astroseasons.h src/declarative/holidayregionsmodel.cpp src/declarative/holidayregionsmodel.h src/declarative/kholidaysdeclarativeplugin.cpp src/declarative/kholidaysdeclarativeplugin.h src/holiday.cpp src/holiday.h src/holiday_p.h src/holidayregion.cpp src/holidayregion.h src/lunarphase.cpp src/lunarphase.h src/parsers/holidayparserdriver.cpp src/parsers/holidayparserdriver_p.h src/parsers/plan2/FlexLexer.h src/parsers/plan2/holidayparserdriverplan.cpp src/parsers/plan2/holidayparserdriverplan_p.h src/parsers/plan2/holidayparserplan.cpp src/parsers/plan2/holidayparserplan.hpp src/parsers/plan2/holidayparserplan.ypp src/parsers/plan2/holidayscannerplan.cpp src/parsers/plan2/holidayscannerplan.lpp src/parsers/plan2/holidayscannerplan_p.h src/parsers/plan2/location.hh src/parsers/plan2/position.hh src/parsers/plan2/stack.hh src/parsers/qcalendarsystem.cpp src/parsers/qcalendarsystem_p.h src/sunriseset.cpp src/sunriseset.h src/zodiac.cpp src/zodiac.h To: cordlandwehr Cc: cgiboudeaux, winterz, kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, ngraham, bruns
D27363: KHolidays: Convert license statements to SPDX expressions
cordlandwehr marked 5 inline comments as done. cordlandwehr added a comment. Updated several statements, but still need clarification if named people are copyright holders or contributors without copyright claim. INLINE COMMENTS > cgiboudeaux wrote in holidayscannerplan.cpp:1297-1301 > and these lines were not updated @winterz same question here as above: are these people copyright holders or file contributors? > cgiboudeaux wrote in qcalendarsystem.cpp:833 > also looks wrong I did them intense code-digging and found the source of this snippet REPOSITORY R175 KHolidays REVISION DETAIL https://phabricator.kde.org/D27363 To: cordlandwehr Cc: cgiboudeaux, winterz, kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, ngraham, bruns
D27363: KHolidays: Convert license statements to SPDX expressions
cordlandwehr updated this revision to Diff 75736. cordlandwehr added a comment. Clarified several statements - Recovered origin of weekNumber method and its original license - Unified verbose license statements - Clarified snippet licensing REPOSITORY R175 KHolidays CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D27363?vs=75594=75736 BRANCH spdx REVISION DETAIL https://phabricator.kde.org/D27363 AFFECTED FILES LICENSES/BSD-2-Clause.txt LICENSES/Bison-exception-2.2.txt LICENSES/GPL-3.0-or-later.txt LICENSES/LGPL-2.0-or-later.txt autotests/testholidayregion.cpp autotests/testholidayregion.h autotests/testlunar.cpp autotests/testlunar.h autotests/testseasons.cpp autotests/testseasons.h autotests/testsunriseset.cpp autotests/testsunriseset.h autotests/testzodiac.cpp src/astroseasons.cpp src/astroseasons.h src/declarative/holidayregionsmodel.cpp src/declarative/holidayregionsmodel.h src/declarative/kholidaysdeclarativeplugin.cpp src/declarative/kholidaysdeclarativeplugin.h src/holiday.cpp src/holiday.h src/holiday_p.h src/holidayregion.cpp src/holidayregion.h src/lunarphase.cpp src/lunarphase.h src/parsers/holidayparserdriver.cpp src/parsers/holidayparserdriver_p.h src/parsers/plan2/FlexLexer.h src/parsers/plan2/holidayparserdriverplan.cpp src/parsers/plan2/holidayparserdriverplan_p.h src/parsers/plan2/holidayparserplan.cpp src/parsers/plan2/holidayparserplan.hpp src/parsers/plan2/holidayparserplan.ypp src/parsers/plan2/holidayscannerplan.cpp src/parsers/plan2/holidayscannerplan.lpp src/parsers/plan2/holidayscannerplan_p.h src/parsers/plan2/location.hh src/parsers/plan2/position.hh src/parsers/plan2/stack.hh src/parsers/qcalendarsystem.cpp src/parsers/qcalendarsystem_p.h src/sunriseset.cpp src/sunriseset.h src/zodiac.cpp src/zodiac.h To: cordlandwehr Cc: cgiboudeaux, winterz, kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, ngraham, bruns
D27363: KHolidays: Convert license statements to SPDX expressions
cgiboudeaux added subscribers: winterz, cgiboudeaux. cgiboudeaux added inline comments. INLINE COMMENTS > holidayregion.cpp:31 > // Copied from qlocale_data_p.h and qlocale.h > -// Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). > +// SPDX-FileCopyrightText: 2014 Digia Plc and /or its subsidiary(-ies). > // To later be replaced by OpenCodes or public Qt api I don't think it should be changed here > lunarphase.cpp:6 > > - Copyright (c) 1989, 1993 //krazy:exclude=copyright > - The Regents of the University of California. All rights reserved. > +SPDX-FileCopyrightText: 1989, 1993 The Regents of the University of > California. All rights reserved. > This looks suspicious @winterz ? > holidayparserdriverplan.cpp:6-13 > +SPDX-FileCopyrightText: Preston Brown > +SPDX-FileCopyrightText: Reinhold Kainhofer > > Portions contributed by > -Peter Littlefield > -Armin Liebl > -Efthimios Mavrogeorgiadis > -Erwin Hugo Achermann > - > -Major rewrite using Bison C++ skeleton: > -Copyright 2010 John Layt > - > -This library is free software; you can redistribute it and/or > -modify it under the terms of the GNU Library General Public > -License as published by the Free Software Foundation; either > -version 2 of the License, or (at your option) any later version. > - > -This library 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 Library General Public License for more details. > - > -You should have received a copy of the GNU Library General Public License > -along with this library; see the file COPYING.LIB. If not, write to the > -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, > -Boston, MA 02110-1301, USA. > +SPDX-FileCopyrightText: Peter Littlefield > +SPDX-FileCopyrightText: Armin Liebl > > +SPDX-FileCopyrightText: Efthimios Mavrogeorgiadis The original text lacks clarity. Are these file contributors or copyright holders? @winterz > holidayparserdriverplan.cpp:15 > + > +Major rewrite using Bison C++ skeleton by > +SPDX-FileCopyrightText: 2010 John Layt why is "by" needed here? > holidayparserplan.ypp:3-10 > +SPDX-FileCopyrightText: Thomas Driemeyer > > Adapted for use in KOrganizer by > -Preston Brown and > -Reinhold Kainhofer > +SPDX-FileCopyrightText: Preston Brown and > +SPDX-FileCopyrightText: Reinhold Kainhofer > > Portions contributed by same question for this file > holidayscannerplan.cpp:1297-1301 > Original version from plan by Thomas Driemeyer > > Adapted for use in KOrganizer by > Preston Brown and > Reinhold Kainhofer and these lines were not updated > qcalendarsystem.cpp:833 > \legalese > -Copyright (c) 1989 The Regents of the University of California. > +SPDX-FileCopyrightText: 1989 The Regents of the University of California > . > All rights reserved. also looks wrong REPOSITORY R175 KHolidays REVISION DETAIL https://phabricator.kde.org/D27363 To: cordlandwehr Cc: cgiboudeaux, winterz, kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, ngraham, bruns
D27363: KHolidays: Convert license statements to SPDX expressions
cordlandwehr added a task: T11550: Add SPDX License markers. REPOSITORY R175 KHolidays REVISION DETAIL https://phabricator.kde.org/D27363 To: cordlandwehr Cc: kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, ngraham, bruns
D27363: KHolidays: Convert license statements to SPDX expressions
cordlandwehr created this revision. Herald added a project: Frameworks. Herald added a subscriber: kde-frameworks-devel. cordlandwehr requested review of this revision. REVISION SUMMARY Convert license statements to SPDX markers and add license files as required by REUSE specification. REPOSITORY R175 KHolidays BRANCH spdx REVISION DETAIL https://phabricator.kde.org/D27363 AFFECTED FILES LICENSES/BSD-2-Clause.txt LICENSES/Bison-exception-2.2.txt LICENSES/GPL-3.0-or-later.txt LICENSES/LGPL-2.0-or-later.txt autotests/testholidayregion.cpp autotests/testholidayregion.h autotests/testlunar.cpp autotests/testlunar.h autotests/testseasons.cpp autotests/testseasons.h autotests/testsunriseset.cpp autotests/testsunriseset.h autotests/testzodiac.cpp src/astroseasons.cpp src/astroseasons.h src/declarative/holidayregionsmodel.cpp src/declarative/holidayregionsmodel.h src/declarative/kholidaysdeclarativeplugin.cpp src/declarative/kholidaysdeclarativeplugin.h src/holiday.cpp src/holiday.h src/holiday_p.h src/holidayregion.cpp src/holidayregion.h src/lunarphase.cpp src/lunarphase.h src/parsers/holidayparserdriver.cpp src/parsers/holidayparserdriver_p.h src/parsers/plan2/FlexLexer.h src/parsers/plan2/holidayparserdriverplan.cpp src/parsers/plan2/holidayparserdriverplan_p.h src/parsers/plan2/holidayparserplan.cpp src/parsers/plan2/holidayparserplan.hpp src/parsers/plan2/holidayparserplan.ypp src/parsers/plan2/holidayscannerplan.cpp src/parsers/plan2/holidayscannerplan.lpp src/parsers/plan2/holidayscannerplan_p.h src/parsers/plan2/location.hh src/parsers/plan2/position.hh src/parsers/plan2/stack.hh src/parsers/qcalendarsystem.cpp src/parsers/qcalendarsystem_p.h src/sunriseset.cpp src/sunriseset.h src/zodiac.cpp src/zodiac.h To: cordlandwehr Cc: kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, ngraham, bruns
