D27363: KHolidays: Convert license statements to SPDX expressions

Christophe Giboudeaux noreply at phabricator.kde.org
Thu Feb 13 13:04:06 GMT 2020


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 <pbrown at kde.org>
> +        SPDX-FileCopyrightText: Reinhold Kainhofer <reinhold at kainhofer.com>
>  
>      Portions contributed by
> -        Peter Littlefield <plittle at sofkin.ca>
> -        Armin Liebl <liebla at informatik.tu-muenchen.de>
> -        Efthimios Mavrogeorgiadis <emav at enl.auth.gr>
> -        Erwin Hugo Achermann <acherman at inf.ethz.ch>
> -
> -    Major rewrite using Bison C++ skeleton:
> -        Copyright 2010 John Layt <john at layt.net>
> -
> -    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 <plittle at sofkin.ca>
> +        SPDX-FileCopyrightText: Armin Liebl <liebla at informatik.tu-muenchen.de>
> +        SPDX-FileCopyrightText: Efthimios Mavrogeorgiadis <emav at enl.auth.gr>

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 <john at layt.net>

why is "by" needed here?

> holidayparserplan.ypp:3-10
> +        SPDX-FileCopyrightText: Thomas Driemeyer <thomas at bitrot.de>
>  
>      Adapted for use in KOrganizer by
> -        Preston Brown <pbrown at kde.org> and
> -        Reinhold Kainhofer <reinhold at kainhofer.com>
> +        SPDX-FileCopyrightText: Preston Brown <pbrown at kde.org> and
> +        SPDX-FileCopyrightText: Reinhold Kainhofer <reinhold at kainhofer.com>
>  
>      Portions contributed by

same question for this file

> holidayscannerplan.cpp:1297-1301
>      Original version from plan by Thomas Driemeyer <thomas at bitrot.de>
>  
>      Adapted for use in KOrganizer by
>          Preston Brown <pbrown at kde.org> and
>          Reinhold Kainhofer <reinhold at kainhofer.com>

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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20200213/3a45db32/attachment-0001.html>


More information about the Kde-frameworks-devel mailing list