diff --git a/src/libkdepim/addressline/recentaddress/recentaddresses.h b/src/libkdepim/addressline/recentaddress/recentaddresses.h --- a/src/libkdepim/addressline/recentaddress/recentaddresses.h +++ b/src/libkdepim/addressline/recentaddress/recentaddresses.h @@ -4,8 +4,9 @@ * Copyright (c) 2003 Zack Rusin * * KMail is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation. + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * KMail is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/libkdepim/addressline/recentaddress/recentaddresses.cpp b/src/libkdepim/addressline/recentaddress/recentaddresses.cpp --- a/src/libkdepim/addressline/recentaddress/recentaddresses.cpp +++ b/src/libkdepim/addressline/recentaddress/recentaddresses.cpp @@ -4,8 +4,9 @@ * Copyright (c) 2003 Zack Rusin * * KMail is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation. + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * KMail is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/libkdepim/progresswidget/progressdialog.h b/src/libkdepim/progresswidget/progressdialog.h --- a/src/libkdepim/progresswidget/progressdialog.h +++ b/src/libkdepim/progresswidget/progressdialog.h @@ -7,7 +7,8 @@ * * This program 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; version 2 of the License + * the Free Software Foundation; either version 2 of the License, 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 diff --git a/src/libkdepim/progresswidget/progressdialog.cpp b/src/libkdepim/progresswidget/progressdialog.cpp --- a/src/libkdepim/progresswidget/progressdialog.cpp +++ b/src/libkdepim/progresswidget/progressdialog.cpp @@ -6,7 +6,8 @@ * * This program 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; version 2 of the License + * the Free Software Foundation; either version 2 of the License, 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 diff --git a/src/libkdepim/progresswidget/ssllabel.h b/src/libkdepim/progresswidget/ssllabel.h --- a/src/libkdepim/progresswidget/ssllabel.h +++ b/src/libkdepim/progresswidget/ssllabel.h @@ -5,8 +5,9 @@ * Copyright (c) 2003 Zack Rusin * * KMail is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation. + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * KMail is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/libkdepim/progresswidget/ssllabel.cpp b/src/libkdepim/progresswidget/ssllabel.cpp --- a/src/libkdepim/progresswidget/ssllabel.cpp +++ b/src/libkdepim/progresswidget/ssllabel.cpp @@ -5,8 +5,9 @@ * Copyright (c) 2003 Zack Rusin * * KMail is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation. + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * KMail is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/libkdepim/progresswidget/statusbarprogresswidget.h b/src/libkdepim/progresswidget/statusbarprogresswidget.h --- a/src/libkdepim/progresswidget/statusbarprogresswidget.h +++ b/src/libkdepim/progresswidget/statusbarprogresswidget.h @@ -9,8 +9,9 @@ Copyright 2004 David Faure KMail is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2 - or above, as published by the Free Software Foundation. + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/libkdepim/progresswidget/statusbarprogresswidget.cpp b/src/libkdepim/progresswidget/statusbarprogresswidget.cpp --- a/src/libkdepim/progresswidget/statusbarprogresswidget.cpp +++ b/src/libkdepim/progresswidget/statusbarprogresswidget.cpp @@ -10,8 +10,9 @@ by Matt Koss KMail is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2 or above, - as published by the Free Software Foundation. + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. KMail is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/libkdepim/widgets/kwidgetlister.h b/src/libkdepim/widgets/kwidgetlister.h --- a/src/libkdepim/widgets/kwidgetlister.h +++ b/src/libkdepim/widgets/kwidgetlister.h @@ -5,9 +5,10 @@ This file is part of libkdepim Copyright (c) 2001 Marc Mutz - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License, - version 2, as published by the Free Software Foundation. + This library 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 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 diff --git a/src/libkdepim/widgets/kwidgetlister.cpp b/src/libkdepim/widgets/kwidgetlister.cpp --- a/src/libkdepim/widgets/kwidgetlister.cpp +++ b/src/libkdepim/widgets/kwidgetlister.cpp @@ -5,9 +5,10 @@ This file is part of libkdepim. Copyright (c) 2001 Marc Mutz - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License, - version 2, as published by the Free Software Foundation. + This library 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 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 diff --git a/src/libkdepim/widgets/overlaywidget.h b/src/libkdepim/widgets/overlaywidget.h --- a/src/libkdepim/widgets/overlaywidget.h +++ b/src/libkdepim/widgets/overlaywidget.h @@ -5,7 +5,8 @@ * * This program 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; version 2 of the License + * the Free Software Foundation; either version 2 of the License, 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 diff --git a/src/libkdepim/widgets/overlaywidget.cpp b/src/libkdepim/widgets/overlaywidget.cpp --- a/src/libkdepim/widgets/overlaywidget.cpp +++ b/src/libkdepim/widgets/overlaywidget.cpp @@ -5,7 +5,8 @@ * * This program 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; version 2 of the License + * the Free Software Foundation; either version 2 of the License, 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 diff --git a/src/libkdepimakonadi/addressline/addresslineedit/addresseelineedit_p.h b/src/libkdepimakonadi/addressline/addresslineedit/addresseelineedit_p.h --- a/src/libkdepimakonadi/addressline/addresslineedit/addresseelineedit_p.h +++ b/src/libkdepimakonadi/addressline/addresslineedit/addresseelineedit_p.h @@ -2,8 +2,9 @@ Copyright (c) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, 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 diff --git a/src/libkdepimakonadi/addressline/addresslineedit/addresseelineedit_p.cpp b/src/libkdepimakonadi/addressline/addresslineedit/addresseelineedit_p.cpp --- a/src/libkdepimakonadi/addressline/addresslineedit/addresseelineedit_p.cpp +++ b/src/libkdepimakonadi/addressline/addresslineedit/addresseelineedit_p.cpp @@ -2,8 +2,9 @@ Copyright (c) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, 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 diff --git a/src/libkdepimakonadi/addressline/addresslineedit/addresseelineeditmanager.h b/src/libkdepimakonadi/addressline/addresslineedit/addresseelineeditmanager.h --- a/src/libkdepimakonadi/addressline/addresslineedit/addresseelineeditmanager.h +++ b/src/libkdepimakonadi/addressline/addresslineedit/addresseelineeditmanager.h @@ -2,8 +2,9 @@ Copyright (c) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, 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 diff --git a/src/libkdepimakonadi/addressline/addresslineedit/addresseelineeditmanager.cpp b/src/libkdepimakonadi/addressline/addresslineedit/addresseelineeditmanager.cpp --- a/src/libkdepimakonadi/addressline/addresslineedit/addresseelineeditmanager.cpp +++ b/src/libkdepimakonadi/addressline/addresslineedit/addresseelineeditmanager.cpp @@ -2,8 +2,9 @@ Copyright (c) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, 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 diff --git a/src/libkdepimakonadi/addressline/completionorder/completionordereditor.h b/src/libkdepimakonadi/addressline/completionorder/completionordereditor.h --- a/src/libkdepimakonadi/addressline/completionorder/completionordereditor.h +++ b/src/libkdepimakonadi/addressline/completionorder/completionordereditor.h @@ -5,7 +5,8 @@ * * This program 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; version 2 of the License + * the Free Software Foundation; either version 2 of the License, 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 diff --git a/src/libkdepimakonadi/addressline/completionorder/completionordereditor.cpp b/src/libkdepimakonadi/addressline/completionorder/completionordereditor.cpp --- a/src/libkdepimakonadi/addressline/completionorder/completionordereditor.cpp +++ b/src/libkdepimakonadi/addressline/completionorder/completionordereditor.cpp @@ -6,7 +6,8 @@ * * This program 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; version 2 of the License + * the Free Software Foundation; either version 2 of the License, 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 diff --git a/src/libkdepimakonadi/widgets/tagselectioncombo.h b/src/libkdepimakonadi/widgets/tagselectioncombo.h --- a/src/libkdepimakonadi/widgets/tagselectioncombo.h +++ b/src/libkdepimakonadi/widgets/tagselectioncombo.h @@ -2,8 +2,9 @@ Copyright (c) 2014 Christian Mollekopf This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, 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 diff --git a/src/libkdepimakonadi/widgets/tagselectioncombo.cpp b/src/libkdepimakonadi/widgets/tagselectioncombo.cpp --- a/src/libkdepimakonadi/widgets/tagselectioncombo.cpp +++ b/src/libkdepimakonadi/widgets/tagselectioncombo.cpp @@ -2,8 +2,9 @@ Copyright (c) 2014 Christian Mollekopf This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, 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 diff --git a/src/libkdepimakonadi/widgets/tagwidgets.h b/src/libkdepimakonadi/widgets/tagwidgets.h --- a/src/libkdepimakonadi/widgets/tagwidgets.h +++ b/src/libkdepimakonadi/widgets/tagwidgets.h @@ -2,8 +2,9 @@ Copyright (c) 2014 Christian Mollekopf This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, 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 diff --git a/src/libkdepimakonadi/widgets/tagwidgets.cpp b/src/libkdepimakonadi/widgets/tagwidgets.cpp --- a/src/libkdepimakonadi/widgets/tagwidgets.cpp +++ b/src/libkdepimakonadi/widgets/tagwidgets.cpp @@ -2,8 +2,9 @@ Copyright (c) 2014 Christian Mollekopf This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, 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