D27245: Ki18n: Convert license headers to SPDX statements

[Andreas Cord-Landwehr]

This revision was automatically updated to reflect the committed changes.
Closed by commit R249:10971279a3e7: Ki18n: Convert license headers to SPDX 
statements (authored by cordlandwehr).

REPOSITORY
  R249 KI18n

CHANGES SINCE LAST UPDATE
  https://phabricator.kde.org/D27245?vs=75592&id=78740

REVISION DETAIL
  https://phabricator.kde.org/D27245

AFFECTED FILES
  LICENSES/BSD-3-Clause.txt
  LICENSES/LGPL-2.0-only.txt
  LICENSES/LGPL-2.0-or-later.txt
  LICENSES/LGPL-2.1-only.txt
  LICENSES/LGPL-3.0-only.txt
  LICENSES/LicenseRef-KDE-Accepted-LGPL.txt
  autotests/ki18ndeclarativetest.cpp
  autotests/klocalizedstringtest.cpp
  autotests/klocalizedstringtest.h
  autotests/ktranscriptcleantest.cpp
  autotests/ktranscriptcleantest.h
  autotests/ktranscripttest.cpp
  autotests/ktranscripttest.h
  autotests/testhelpers.cpp
  autotests/testhelpers.h
  cmake/FindLibIntl.cmake
  cmake/KF5I18nMacros.cmake.in
  cmake/build-pofiles.cmake
  cmake/build-tsfiles.cmake
  cmake/kf5i18nuic.cmake
  cmake/rules_PyKF5.py
  src/common_helpers.cpp
  src/common_helpers_p.h
  src/config.h.in
  src/gettext.h
  src/kcatalog.cpp
  src/kcatalog_p.h
  src/klocalizedcontext.cpp
  src/klocalizedcontext.h
  src/klocalizedstring.cpp
  src/klocalizedstring.h
  src/klocalizedtranslator.cpp
  src/klocalizedtranslator.h
  src/ktranscript.cpp
  src/ktranscript_p.h
  src/kuitmarkup.cpp
  src/kuitmarkup.h
  src/kuitmarkup_p.h
  src/kuitsetup.h
  src/main.cpp

To: cordlandwehr, cgiboudeaux
Cc: kossebau, cgiboudeaux, kde-frameworks-devel, LeGast00n, cblack, GB_2, 
michaelh, ngraham, bruns

D27245: Ki18n: Convert license headers to SPDX statements

[Christophe Giboudeaux]

cgiboudeaux accepted this revision.
This revision is now accepted and ready to land.

REPOSITORY
  R249 KI18n

BRANCH
  spdx

REVISION DETAIL
  https://phabricator.kde.org/D27245

To: cordlandwehr, cgiboudeaux
Cc: kossebau, cgiboudeaux, kde-frameworks-devel, LeGast00n, cblack, GB_2, 
michaelh, ngraham, bruns

D27245: Ki18n: Convert license headers to SPDX statements

[Andreas Cord-Landwehr]

cordlandwehr marked 4 inline comments as done.

REPOSITORY
  R249 KI18n

REVISION DETAIL
  https://phabricator.kde.org/D27245

To: cordlandwehr
Cc: kossebau, cgiboudeaux, kde-frameworks-devel, LeGast00n, cblack, GB_2, 
michaelh, ngraham, bruns

D27245: Ki18n: Convert license headers to SPDX statements

[Andreas Cord-Landwehr]

cordlandwehr added a comment.


  Regarding the removal of the COPYING.LIB file, I would prefer to wait and 
remove all of them in all repositories in one run. It will be a trivial script 
to review.
  My main argument is that I did not yet remove them in other pull requests, so 
for consistency I would like to keep them for now.

REPOSITORY
  R249 KI18n

REVISION DETAIL
  https://phabricator.kde.org/D27245

To: cordlandwehr
Cc: kossebau, cgiboudeaux, kde-frameworks-devel, LeGast00n, cblack, GB_2, 
michaelh, ngraham, bruns

D27245: Ki18n: Convert license headers to SPDX statements

[Christophe Giboudeaux]

cgiboudeaux added a comment.


  In D27245#619834 , @cordlandwehr 
wrote:
  
  > So, how to move forward with this change? The two open discussion points 
are:
  >
  > - How to handle COPYING files? --> IMO this is a general question that I 
want to address in a global change when we updated all the license headers. For 
this I created a task to track this question: https://phabricator.kde.org/T12730
  
  
  IMO, duplicating the license files is not necessary as long as there are no 
file refering to COPYING.LIB. This could be done now.
  
  > - How to handle the unneeded empty lines in the license file? --> the 
license files must not be changed according to https://reuse.software/faq/, 
thus I created an upstream issue at SPDX 
(https://github.com/spdx/license-list-data/issues/60). but I am afraid that we 
have to wait for this issue to be fixed before we can update the license files 
on our side. Judging from experience, this will take quite some time and 
according to the REUSE guidelines we are doing everything correctly.
  
  Let's keep them until https://github.com/spdx/LicenseListPublisher/issues/61 
is fixed.

REPOSITORY
  R249 KI18n

REVISION DETAIL
  https://phabricator.kde.org/D27245

To: cordlandwehr
Cc: kossebau, cgiboudeaux, kde-frameworks-devel, LeGast00n, cblack, GB_2, 
michaelh, ngraham, bruns

D27245: Ki18n: Convert license headers to SPDX statements

[Andreas Cord-Landwehr]

cordlandwehr added a comment.


  Ping :)

REPOSITORY
  R249 KI18n

REVISION DETAIL
  https://phabricator.kde.org/D27245

To: cordlandwehr
Cc: kossebau, cgiboudeaux, kde-frameworks-devel, LeGast00n, cblack, GB_2, 
michaelh, ngraham, bruns

D27245: Ki18n: Convert license headers to SPDX statements

[Andreas Cord-Landwehr]

cordlandwehr added a comment.


  So, how to move forward with this change? The two open discussion points are:
  
  - How to handle COPYING files? --> IMO this is a general question that I want 
to address in a global change when we updated all the license headers. For this 
I created a task to track this question: https://phabricator.kde.org/T12730
  - How to handle the unneeded empty lines in the license file? --> the license 
files must not be changed according to https://reuse.software/faq/, thus I 
created an upstream issue at SPDX 
(https://github.com/spdx/license-list-data/issues/60). but I am afraid that we 
have to wait for this issue to be fixed before we can update the license files 
on our side. Judging from experience, this will take quite some time and 
according to the REUSE guidelines we are doing everything correctly.

REPOSITORY
  R249 KI18n

REVISION DETAIL
  https://phabricator.kde.org/D27245

To: cordlandwehr
Cc: kossebau, cgiboudeaux, kde-frameworks-devel, LeGast00n, cblack, GB_2, 
michaelh, ngraham, bruns

D27245: Ki18n: Convert license headers to SPDX statements

[Andreas Cord-Landwehr]

cordlandwehr added a comment.


  In D27245#614915 , @kossebau wrote:
  
  > What about the `COPYING.LIB` file (containing LGLP 2.1 text) in the root 
directory? Could that not be removed given the new copy 
`LICENSES/LGPL-2.1-only.txt`?
  >  Or are both copies required? If so, why? Similar question also for any 
other repo.
  
  
  I agree, this file is obsolete. Yet, I did not touch it in any of the pull 
requests for the following reasons:
  
  - Several of the COPYING.LIB files are stating the wrong license revision, 
since we have frameworks that are only licensed LGPL-2.0 (as a common 
denominator)
  - This COPYING file is (in my perception) also understood as the outbound 
license of the whole library/application. Yet, this is a topic I only want to 
approach in a second step after clarifying the used licenses. The whole 
statement of the outbound license of a library is actually not defined yet 
AFAIS.
  - I just created a ticket for REUSE 
(https://github.com/fsfe/reuse-docs/issues/56) and asking for clarification, 
mostly because the GPL HowTo suggests to adding this file 
(https://www.gnu.org/licenses/gpl-howto.html).
  
  I will created another work item on the KF6 board for tracking the COPYING 
file handling, such that this does not block the progress for the SPDX 
identifier introduction.

REPOSITORY
  R249 KI18n

REVISION DETAIL
  https://phabricator.kde.org/D27245

To: cordlandwehr
Cc: kossebau, cgiboudeaux, kde-frameworks-devel, LeGast00n, cblack, GB_2, 
michaelh, ngraham, bruns

D27245: Ki18n: Convert license headers to SPDX statements

[Friedrich W. H. Kossebau]

kossebau added a comment.


  What about the `COPYING.LIB` file (containing LGLP 2.1 text) in the root 
directory? Could that not be removed given the new copy 
`LICENSES/LGPL-2.1-only.txt`?
  Or are both copies required? If so, why? Similar question also for any other 
repo.

REPOSITORY
  R249 KI18n

REVISION DETAIL
  https://phabricator.kde.org/D27245

To: cordlandwehr
Cc: kossebau, cgiboudeaux, kde-frameworks-devel, LeGast00n, cblack, GB_2, 
michaelh, ngraham, bruns

D27245: Ki18n: Convert license headers to SPDX statements

[Andreas Cord-Landwehr]

cordlandwehr added a comment.


  Link to issue on reuse-tool tracker regarding empty lines in LGPL-3.0-only 
license text: https://github.com/fsfe/reuse-tool/issues/178

REPOSITORY
  R249 KI18n

REVISION DETAIL
  https://phabricator.kde.org/D27245

To: cordlandwehr
Cc: cgiboudeaux, kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, 
ngraham, bruns

D27245: Ki18n: Convert license headers to SPDX statements

[Andreas Cord-Landwehr]

cordlandwehr added inline comments.

INLINE COMMENTS

> cgiboudeaux wrote in LGPL-3.0-only.txt:15-17
> well, the SPDX text doesn't have these extra lines:
> https://spdx.org/licenses/LGPL-3.0-only.html#licenseText

Just tested again with the reuse tool and it actually provides the license with 
these empty lines. I will report an issue on the reuse tool's bug tracker. For 
now, I would prefer to stick with these (strange) empty lines and update the 
license text only when REUSE is updating their tooling.

REPOSITORY
  R249 KI18n

REVISION DETAIL
  https://phabricator.kde.org/D27245

To: cordlandwehr
Cc: cgiboudeaux, kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, 
ngraham, bruns

D27245: Ki18n: Convert license headers to SPDX statements

[Christophe Giboudeaux]

cgiboudeaux added inline comments.

INLINE COMMENTS

> cordlandwehr wrote in LGPL-3.0-only.txt:15-17
> Actually, I have no idea. But according to the REUSE specification, the 
> license files must no be changed and used exactly as provided by SPDX.
> All license files, except the LicenseRef files, of course, were downloaded 
> via the "reuse download" tool and thus are the unmodified versions as 
> provided by SPDX.

well, the SPDX text doesn't have these extra lines:
https://spdx.org/licenses/LGPL-3.0-only.html#licenseText

REPOSITORY
  R249 KI18n

REVISION DETAIL
  https://phabricator.kde.org/D27245

To: cordlandwehr
Cc: cgiboudeaux, kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, 
ngraham, bruns

D27245: Ki18n: Convert license headers to SPDX statements

[Andreas Cord-Landwehr]

cordlandwehr marked an inline comment as done.

REPOSITORY
  R249 KI18n

REVISION DETAIL
  https://phabricator.kde.org/D27245

To: cordlandwehr
Cc: cgiboudeaux, kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, 
ngraham, bruns

D27245: Ki18n: Convert license headers to SPDX statements

[Andreas Cord-Landwehr]

cordlandwehr updated this revision to Diff 75592.
cordlandwehr added a comment.


  Remove unneeded whitespace

REPOSITORY
  R249 KI18n

CHANGES SINCE LAST UPDATE
  https://phabricator.kde.org/D27245?vs=75591&id=75592

BRANCH
  spdx

REVISION DETAIL
  https://phabricator.kde.org/D27245

AFFECTED FILES
  LICENSES/BSD-3-Clause.txt
  LICENSES/LGPL-2.0-only.txt
  LICENSES/LGPL-2.0-or-later.txt
  LICENSES/LGPL-2.1-only.txt
  LICENSES/LGPL-3.0-only.txt
  LICENSES/LicenseRef-KDE-Accepted-LGPL.txt
  autotests/ki18ndeclarativetest.cpp
  autotests/klocalizedstringtest.cpp
  autotests/klocalizedstringtest.h
  autotests/ktranscriptcleantest.cpp
  autotests/ktranscriptcleantest.h
  autotests/ktranscripttest.cpp
  autotests/ktranscripttest.h
  autotests/testhelpers.cpp
  autotests/testhelpers.h
  cmake/FindLibIntl.cmake
  cmake/KF5I18nMacros.cmake.in
  cmake/build-pofiles.cmake
  cmake/build-tsfiles.cmake
  cmake/kf5i18nuic.cmake
  cmake/rules_PyKF5.py
  src/common_helpers.cpp
  src/common_helpers_p.h
  src/config.h.in
  src/gettext.h
  src/kcatalog.cpp
  src/kcatalog_p.h
  src/klocalizedcontext.cpp
  src/klocalizedcontext.h
  src/klocalizedstring.cpp
  src/klocalizedstring.h
  src/klocalizedtranslator.cpp
  src/klocalizedtranslator.h
  src/ktranscript.cpp
  src/ktranscript_p.h
  src/kuitmarkup.cpp
  src/kuitmarkup.h
  src/kuitmarkup_p.h
  src/kuitsetup.h
  src/main.cpp

To: cordlandwehr
Cc: cgiboudeaux, kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, 
ngraham, bruns

D27245: Ki18n: Convert license headers to SPDX statements

[Andreas Cord-Landwehr]

cordlandwehr updated this revision to Diff 75591.
cordlandwehr added a comment.


  Unify license comment header style

REPOSITORY
  R249 KI18n

CHANGES SINCE LAST UPDATE
  https://phabricator.kde.org/D27245?vs=75246&id=75591

BRANCH
  spdx

REVISION DETAIL
  https://phabricator.kde.org/D27245

AFFECTED FILES
  LICENSES/BSD-3-Clause.txt
  LICENSES/LGPL-2.0-only.txt
  LICENSES/LGPL-2.0-or-later.txt
  LICENSES/LGPL-2.1-only.txt
  LICENSES/LGPL-3.0-only.txt
  LICENSES/LicenseRef-KDE-Accepted-LGPL.txt
  autotests/ki18ndeclarativetest.cpp
  autotests/klocalizedstringtest.cpp
  autotests/klocalizedstringtest.h
  autotests/ktranscriptcleantest.cpp
  autotests/ktranscriptcleantest.h
  autotests/ktranscripttest.cpp
  autotests/ktranscripttest.h
  autotests/testhelpers.cpp
  autotests/testhelpers.h
  cmake/FindLibIntl.cmake
  cmake/KF5I18nMacros.cmake.in
  cmake/build-pofiles.cmake
  cmake/build-tsfiles.cmake
  cmake/kf5i18nuic.cmake
  cmake/rules_PyKF5.py
  src/common_helpers.cpp
  src/common_helpers_p.h
  src/config.h.in
  src/gettext.h
  src/kcatalog.cpp
  src/kcatalog_p.h
  src/klocalizedcontext.cpp
  src/klocalizedcontext.h
  src/klocalizedstring.cpp
  src/klocalizedstring.h
  src/klocalizedtranslator.cpp
  src/klocalizedtranslator.h
  src/ktranscript.cpp
  src/ktranscript_p.h
  src/kuitmarkup.cpp
  src/kuitmarkup.h
  src/kuitmarkup_p.h
  src/kuitsetup.h
  src/main.cpp

To: cordlandwehr
Cc: cgiboudeaux, kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, 
ngraham, bruns

D27245: Ki18n: Convert license headers to SPDX statements

[Andreas Cord-Landwehr]

cordlandwehr added inline comments.

INLINE COMMENTS

> cgiboudeaux wrote in LGPL-3.0-only.txt:15-17
> why are there so many empty lines?

Actually, I have no idea. But according to the REUSE specification, the license 
files must no be changed and used exactly as provided by SPDX.
All license files, except the LicenseRef files, of course, were downloaded via 
the "reuse download" tool and thus are the unmodified versions as provided by 
SPDX.

REPOSITORY
  R249 KI18n

REVISION DETAIL
  https://phabricator.kde.org/D27245

To: cordlandwehr
Cc: cgiboudeaux, kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, 
ngraham, bruns

D27245: Ki18n: Convert license headers to SPDX statements

[Christophe Giboudeaux]

cgiboudeaux added a comment.


  some headers have 3 leading whitespaces, some 4. Can you clarify?

INLINE COMMENTS

> LGPL-3.0-only.txt:15-17
> +
> +  
> +

why are there so many empty lines?

> gettext.h:2
>  /* Convenience header for conditional use of GNU .
> -   Copyright (C) 1995-1998, 2000-2002, 2004-2006 Free Software Foundation, 
> Inc.
> -
> -   This program 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, 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
> -   Library General Public License for more details.
> -
> -   You should have received a copy of the GNU Library General Public
> -   License along with this program; if not, write to the Free Software
> -   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
> -   USA.  */
> +   SPDX-FileCopyrightText: 1995-1998, 2000-2002, 2004-2006 Free Software 
> Foundation , Inc.
> +

extra space after "Free Software Foundation"

REPOSITORY
  R249 KI18n

REVISION DETAIL
  https://phabricator.kde.org/D27245

To: cordlandwehr
Cc: cgiboudeaux, kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, 
ngraham, bruns

D27245: Ki18n: Convert license headers to SPDX statements

[Andreas Cord-Landwehr]

cordlandwehr added a task: T11550: Add SPDX License markers.

REPOSITORY
  R249 KI18n

REVISION DETAIL
  https://phabricator.kde.org/D27245

To: cordlandwehr
Cc: kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, ngraham, bruns

D27245: Ki18n: Convert license headers to SPDX statements

[Andreas Cord-Landwehr]

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 and add license text files in LICENSES
  folder as required by the REUSE specification.

REPOSITORY
  R249 KI18n

BRANCH
  spdx

REVISION DETAIL
  https://phabricator.kde.org/D27245

AFFECTED FILES
  LICENSES/BSD-3-Clause.txt
  LICENSES/LGPL-2.0-only.txt
  LICENSES/LGPL-2.0-or-later.txt
  LICENSES/LGPL-2.1-only.txt
  LICENSES/LGPL-3.0-only.txt
  LICENSES/LicenseRef-KDE-Accepted-LGPL.txt
  autotests/ki18ndeclarativetest.cpp
  autotests/klocalizedstringtest.cpp
  autotests/klocalizedstringtest.h
  autotests/ktranscriptcleantest.cpp
  autotests/ktranscriptcleantest.h
  autotests/ktranscripttest.cpp
  autotests/ktranscripttest.h
  autotests/testhelpers.cpp
  autotests/testhelpers.h
  cmake/FindLibIntl.cmake
  cmake/KF5I18nMacros.cmake.in
  cmake/build-pofiles.cmake
  cmake/build-tsfiles.cmake
  cmake/kf5i18nuic.cmake
  cmake/rules_PyKF5.py
  src/common_helpers.cpp
  src/common_helpers_p.h
  src/config.h.in
  src/gettext.h
  src/kcatalog.cpp
  src/kcatalog_p.h
  src/klocalizedcontext.cpp
  src/klocalizedcontext.h
  src/klocalizedstring.cpp
  src/klocalizedstring.h
  src/klocalizedtranslator.cpp
  src/klocalizedtranslator.h
  src/ktranscript.cpp
  src/ktranscript_p.h
  src/kuitmarkup.cpp
  src/kuitmarkup.h
  src/kuitmarkup_p.h
  src/kuitsetup.h
  src/main.cpp

To: cordlandwehr
Cc: kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, ngraham, bruns