From 4acb4e5e7e8bbd57432438f2f3d83e4c8adde4173f210cdcf24d53995a3e4895 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 29 Aug 2015 07:12:57 +0000 Subject: [PATCH] - OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=5 --- akonadi-fix-licenses.diff | 385 ++++++++++++++++++++++++++++++++++++++ akonadi-server.changes | 6 + akonadi-server.spec | 2 + 3 files changed, 393 insertions(+) create mode 100644 akonadi-fix-licenses.diff diff --git a/akonadi-fix-licenses.diff b/akonadi-fix-licenses.diff new file mode 100644 index 0000000..faa2d59 --- /dev/null +++ b/akonadi-fix-licenses.diff @@ -0,0 +1,385 @@ +commit 79758c9302532574920510a890be770a592b38a5 +Author: Dan Vrátil +Date: Fri Aug 28 16:05:27 2015 +0200 + + Fix incorrect license of some files + + The license should be LGPLv2.1+ everywhere, but some file were accidentally + licensed under GPLv2. This patch relicenses those files to he under LGPLv2.1+ + too. All contributors agreed to the change. + + BUG: 351747 + FIXED-IN: 15.08.1 + +diff --git a/autotests/server/fakeakonadiserver.cpp b/autotests/server/fakeakonadiserver.cpp +index f1b9376..0b482eb 100644 +--- a/autotests/server/fakeakonadiserver.cpp ++++ b/autotests/server/fakeakonadiserver.cpp +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2014 Daniel Vrátil + * +- * 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; either version 2 of the License, or +- * (at your option) any later version. ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. + * +- * This program is distributed in the hope that it will be useful, ++ * 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 General Public License for more details. ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU 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. ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +diff --git a/autotests/server/fakeakonadiserver.h b/autotests/server/fakeakonadiserver.h +index cf90e3d..ccc789a 100644 +--- a/autotests/server/fakeakonadiserver.h ++++ b/autotests/server/fakeakonadiserver.h +@@ -1,22 +1,21 @@ + /* + * Copyright (C) 2014 Daniel Vrátil + * +- * 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; either version 2 of the License, or +- * (at your option) any later version. ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. + * +- * This program is distributed in the hope that it will be useful, ++ * 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 General Public License for more details. ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU 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. ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ +- + #ifndef FAKEAKONADISERVER_H + #define FAKEAKONADISERVER_H + +diff --git a/src/private/datastream_p.cpp b/src/private/datastream_p.cpp +index c257e68..55621fa 100644 +--- a/src/private/datastream_p.cpp ++++ b/src/private/datastream_p.cpp +@@ -1,22 +1,20 @@ + /* +- * Copyright 2015 Daniel Vrátil ++ * Copyright (C) 2015 Daniel Vrátil + * +- * 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; either version 2 of +- * the License or (at your option) version 3 or any later version +- * accepted by the membership of KDE e.V. (or its successor approved +- * by the membership of KDE e.V.), which shall act as a proxy +- * defined in Section 14 of version 3 of the license. +- * +- * This program is distributed in the hope that it will be useful, ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 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 General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program. If not, see . +- * ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ * + */ + + #include "datastream_p_p.h" +diff --git a/src/private/datastream_p_p.h b/src/private/datastream_p_p.h +index 8b24e3d..f15c063 100644 +--- a/src/private/datastream_p_p.h ++++ b/src/private/datastream_p_p.h +@@ -1,22 +1,20 @@ + /* +- * Copyright 2015 Daniel Vrátil +- * +- * 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; either version 2 of +- * the License or (at your option) version 3 or any later version +- * accepted by the membership of KDE e.V. (or its successor approved +- * by the membership of KDE e.V.), which shall act as a proxy +- * defined in Section 14 of version 3 of the license. +- * +- * This program is distributed in the hope that it will be useful, ++ * Copyright (C) 2015 Daniel Vrátil ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 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 General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program. If not, see . +- * ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ * + */ + + #ifndef AKONADI_PROTOCOL_DATASTREAM_H +diff --git a/src/server/commandcontext.cpp b/src/server/commandcontext.cpp +index 6ec5532..552d936 100644 +--- a/src/server/commandcontext.cpp ++++ b/src/server/commandcontext.cpp +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2014 Daniel Vrátil + * +- * 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; either version 2 of the License, or +- * (at your option) any later version. ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. + * +- * This program is distributed in the hope that it will be useful, ++ * 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 General Public License for more details. ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU 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. ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +diff --git a/src/server/commandcontext.h b/src/server/commandcontext.h +index b9b1ef4..d6dd499 100644 +--- a/src/server/commandcontext.h ++++ b/src/server/commandcontext.h +@@ -1,22 +1,23 @@ + /* + * Copyright (C) 2014 Daniel Vrátil + * +- * 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; either version 2 of the License, or +- * (at your option) any later version. ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. + * +- * This program is distributed in the hope that it will be useful, ++ * 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 General Public License for more details. ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU 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. ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + ++ + #ifndef COMMANDCONTEXT_H + #define COMMANDCONTEXT_H + +diff --git a/src/server/handler/searchresult.cpp b/src/server/handler/searchresult.cpp +index e6606da..07545a3 100644 +--- a/src/server/handler/searchresult.cpp ++++ b/src/server/handler/searchresult.cpp +@@ -1,21 +1,19 @@ + /* +- * Copyright 2013 Daniel Vrátil ++ * Copyright (C) 2013 Daniel Vrátil + * +- * 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; either version 2 of +- * the License or (at your option) version 3 or any later version +- * accepted by the membership of KDE e.V. (or its successor approved +- * by the membership of KDE e.V.), which shall act as a proxy +- * defined in Section 14 of version 3 of the license. ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. + * +- * This program is distributed in the hope that it will be useful, ++ * 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 General Public License for more details. ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public License +- * along with this program. If not, see . ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +diff --git a/src/server/handler/searchresult.h b/src/server/handler/searchresult.h +index 4766509..308cdfa 100644 +--- a/src/server/handler/searchresult.h ++++ b/src/server/handler/searchresult.h +@@ -1,24 +1,23 @@ + /* +- * Copyright 2013 Daniel Vrátil ++ * Copyright (C) 2013 Daniel Vrátil + * +- * 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; either version 2 of +- * the License or (at your option) version 3 or any later version +- * accepted by the membership of KDE e.V. (or its successor approved +- * by the membership of KDE e.V.), which shall act as a proxy +- * defined in Section 14 of version 3 of the license. ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. + * +- * This program is distributed in the hope that it will be useful, ++ * 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 General Public License for more details. ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public License +- * along with this program. If not, see . ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + ++ + #ifndef AKONADI_SEARCHRESULT_H + #define AKONADI_SEARCHRESULT_H + +diff --git a/src/server/storage/storagedebugger.cpp b/src/server/storage/storagedebugger.cpp +index 9a5e2d4..15ae2eb 100644 +--- a/src/server/storage/storagedebugger.cpp ++++ b/src/server/storage/storagedebugger.cpp +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2013 Daniel Vrátil + * +- * 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; either version 2 of the License, or +- * (at your option) any later version. ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. + * +- * This program is distributed in the hope that it will be useful, ++ * 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 General Public License for more details. ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU 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. ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +diff --git a/src/server/storage/storagedebugger.h b/src/server/storage/storagedebugger.h +index 1d6f9e5..91b6934 100644 +--- a/src/server/storage/storagedebugger.h ++++ b/src/server/storage/storagedebugger.h +@@ -1,19 +1,19 @@ + /* + * Copyright (C) 2013 Daniel Vrátil + * +- * 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; either version 2 of the License, or +- * (at your option) any later version. ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. + * +- * This program is distributed in the hope that it will be useful, ++ * 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 General Public License for more details. ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU 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. ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + diff --git a/akonadi-server.changes b/akonadi-server.changes index 3bc8c5e..412e337 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Aug 29 07:10:31 UTC 2015 - cgiboudeaux@gmx.com + +- Add akonadi-fix-licenses.diff. All files shall be LGPL-2.1+ + Fixes kde#351747 and boo#942998 + ------------------------------------------------------------------- Mon Aug 24 11:04:45 UTC 2015 - cgiboudeaux@gmx.com diff --git a/akonadi-server.spec b/akonadi-server.spec index 5fbdb60..e2bd2eb 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -26,6 +26,8 @@ Group: System/GUI/KDE Url: http://akonadi-project.org Source: %{rname}-%{version}.tar.xz Source99: akonadi-server-rpmlintrc +# PATCH-FIX-UPSTREAM akonadi-fix-licenses.diff -- Ensure all files are LGPL-2.1+ -- kde#351747 boo#942998 +Patch0: akonadi-fix-licenses.diff BuildRequires: boost-devel BuildRequires: cmake >= 2.8.9 BuildRequires: kf5-filesystem