From 8853e71e01af9bfeefdb3502e66bb4146490d930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 12 Jun 2021 22:24:58 +0200 Subject: [PATCH] kde-plasma: licenses post fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../tier3/plasma-workspace/plasma-workspace.bb | 2 +- .../plasma/untier/kde-cli-tools/kde-cli-tools.bb | 13 ++++++++++--- recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb | 7 ++++--- .../plasma/untier/ksshaskpass/ksshaskpass.bb | 4 ++-- recipes-kde/plasma/untier/kwrited/kwrited.bb | 4 ++-- recipes-kde/plasma/untier/milou/milou.bb | 9 ++++++--- recipes-kde/plasma/untier/plasma-pa/plasma-pa.bb | 10 +++++++--- .../plasma/untier/plasma-vault/plasma-vault.bb | 9 +++++---- .../plasma/untier/systemsettings/systemsettings.bb | 8 +++++--- 9 files changed, 42 insertions(+), 24 deletions(-) diff --git a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb index 3da7e556..d2f2d588 100644 --- a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb +++ b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb @@ -67,6 +67,7 @@ FILES_${PN} += " \ ${datadir}/xsessions \ \ ${libdir}/libkdeinit5*.so \ + ${libdir}/libkrdb.so \ ${libdir}/kconf_update_bin \ ${OE_QMAKE_PATH_PLUGINS} \ ${OE_QMAKE_PATH_QML} \ @@ -81,7 +82,6 @@ FILES_SOLIBSDEV = " \ ${libdir}/libtaskmanager${SOLIBSDEV} \ ${libdir}/libweather_ion${SOLIBSDEV} \ ${libdir}/libkfontinst*${SOLIBSDEV} \ - ${libdir}/libkrdb${SOLIBSDEV} \ " diff --git a/recipes-kde/plasma/untier/kde-cli-tools/kde-cli-tools.bb b/recipes-kde/plasma/untier/kde-cli-tools/kde-cli-tools.bb index 23132f12..a6a1e0ca 100644 --- a/recipes-kde/plasma/untier/kde-cli-tools/kde-cli-tools.bb +++ b/recipes-kde/plasma/untier/kde-cli-tools/kde-cli-tools.bb @@ -1,8 +1,15 @@ SUMMARY = "Tools based on KDE Frameworks 5 to better interact with the system" -LICENSE = "GPL-2.0 & LGPL-2.1" +LICENSE = "Artistic-2.0 & GFDL-1.2+ & GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only & LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-3.0-only" LIC_FILES_CHKSUM = " \ - file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ + file://LICENSES/Artistic-2.0.txt;md5=7f086b1df814d268c59965d8db41f13c \ + file://LICENSES/GFDL-1.2-or-later.txt;md5=9f58808219e9a42ff1228309d6f83dc6 \ + file://LICENSES/GPL-2.0-only.txt;md5=9e2385fe012386d34dcc5c9863070881 \ + file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \ + file://LICENSES/GPL-3.0-only.txt;md5=49fc03046e56a282c0c743b5d3a55b7c \ + file://LICENSES/LGPL-2.0-only.txt;md5=da48810c4ddf8e49efa031294a26b98c \ + file://LICENSES/LGPL-2.0-or-later.txt;md5=da48810c4ddf8e49efa031294a26b98c \ + file://LICENSES/LGPL-2.1-only.txt;md5=147a320ed8b16b036829a0c71d424153 \ + file://LICENSES/LGPL-3.0-only.txt;md5=8d51f5b5fd447f7a1040c3dc9f0a8de6 \ " inherit kde-plasma gettext diff --git a/recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb b/recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb index 3f1069f0..0f7bd944 100644 --- a/recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb +++ b/recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb @@ -1,8 +1,9 @@ SUMMARY = "KMENUEDIT" -LICENSE = "GPL-2.0 & GFDL-1.2" +LICENSE = "GFDL-1.2+ & GPL-2.0-only & GPL-2.0-or-later" LIC_FILES_CHKSUM = " \ - file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \ - file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \ + file://LICENSES/GFDL-1.2-or-later.txt;md5=9f58808219e9a42ff1228309d6f83dc6 \ + file://LICENSES/GPL-2.0-only.txt;md5=9e2385fe012386d34dcc5c9863070881 \ + file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \ " inherit kde-plasma gettext diff --git a/recipes-kde/plasma/untier/ksshaskpass/ksshaskpass.bb b/recipes-kde/plasma/untier/ksshaskpass/ksshaskpass.bb index 44b744c8..61a22bd6 100644 --- a/recipes-kde/plasma/untier/ksshaskpass/ksshaskpass.bb +++ b/recipes-kde/plasma/untier/ksshaskpass/ksshaskpass.bb @@ -1,7 +1,7 @@ SUMMARY = "ssh-add helper that uses kwallet and kpassworddialog" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = " \ - file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \ + file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \ " inherit kde-plasma gettext diff --git a/recipes-kde/plasma/untier/kwrited/kwrited.bb b/recipes-kde/plasma/untier/kwrited/kwrited.bb index f776afba..ab47f091 100644 --- a/recipes-kde/plasma/untier/kwrited/kwrited.bb +++ b/recipes-kde/plasma/untier/kwrited/kwrited.bb @@ -1,7 +1,7 @@ SUMMARY = "KWriteD: Listen to traditional system notifications" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = " \ - file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \ + file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \ " inherit kde-plasma gettext diff --git a/recipes-kde/plasma/untier/milou/milou.bb b/recipes-kde/plasma/untier/milou/milou.bb index 7f2a8a41..b262d9dc 100644 --- a/recipes-kde/plasma/untier/milou/milou.bb +++ b/recipes-kde/plasma/untier/milou/milou.bb @@ -1,8 +1,11 @@ SUMMARY = "A dedicated search application built on top of Baloo" -LICENSE = "GPL-2.0 & LGPL-2.1" +LICENSE = "GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only & LGPL-2.1-only & LGPL-3.0-only" LIC_FILES_CHKSUM = " \ - file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ + file://LICENSES/GPL-2.0-only.txt;md5=9e2385fe012386d34dcc5c9863070881 \ + file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \ + file://LICENSES/GPL-3.0-only.txt;md5=49fc03046e56a282c0c743b5d3a55b7c \ + file://LICENSES/LGPL-2.1-only.txt;md5=147a320ed8b16b036829a0c71d424153 \ + file://LICENSES/LGPL-3.0-only.txt;md5=8d51f5b5fd447f7a1040c3dc9f0a8de6 \ " inherit kde-plasma gettext diff --git a/recipes-kde/plasma/untier/plasma-pa/plasma-pa.bb b/recipes-kde/plasma/untier/plasma-pa/plasma-pa.bb index 44e6873e..a36c955a 100644 --- a/recipes-kde/plasma/untier/plasma-pa/plasma-pa.bb +++ b/recipes-kde/plasma/untier/plasma-pa/plasma-pa.bb @@ -1,8 +1,12 @@ SUMMARY = "Plasma applet for audio volume management using PulseAudio" -LICENSE = "GPL-2.0 & LGPL-2.1" +LICENSE = "BSD-3-Clause & GPL-2.0-only & GPL-3.0-only & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-3.0-only" LIC_FILES_CHKSUM = " \ - file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \ - file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://LICENSES/BSD-3-Clause.txt;md5=954f4d71a37096249f837652a7f586c0 \ + file://LICENSES/GPL-2.0-only.txt;md5=9e2385fe012386d34dcc5c9863070881 \ + file://LICENSES/GPL-3.0-only.txt;md5=49fc03046e56a282c0c743b5d3a55b7c \ + file://LICENSES/LGPL-2.0-or-later.txt;md5=da48810c4ddf8e49efa031294a26b98c \ + file://LICENSES/LGPL-2.1-only.txt;md5=147a320ed8b16b036829a0c71d424153 \ + file://LICENSES/LGPL-3.0-only.txt;md5=8d51f5b5fd447f7a1040c3dc9f0a8de6 \ " inherit kde-plasma gettext diff --git a/recipes-kde/plasma/untier/plasma-vault/plasma-vault.bb b/recipes-kde/plasma/untier/plasma-vault/plasma-vault.bb index 043ee74b..9ef17536 100644 --- a/recipes-kde/plasma/untier/plasma-vault/plasma-vault.bb +++ b/recipes-kde/plasma/untier/plasma-vault/plasma-vault.bb @@ -1,9 +1,10 @@ SUMMARY = "A collection of package management tools for Debian-based systems" -LICENSE = "GPL-2.0 & LGPL-2.0 & LGPL-2.1" +LICENSE = "GPL-2.0-only & GPL-3.0-only & LGPL-2.1-only & LGPL-3.0-only" LIC_FILES_CHKSUM = " \ - file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ - file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ + file://LICENSES/GPL-2.0-only.txt;md5=93e64b4a83c7e441e48bbdeeea05c977 \ + file://LICENSES/GPL-3.0-only.txt;md5=1c76c4cc354acaac30ed4d5eefea7245 \ + file://LICENSES/LGPL-2.1-only.txt;md5=fabba2a3bfeb22a6483d44e9ae824d3f \ + file://LICENSES/LGPL-3.0-only.txt;md5=c51d3eef3be114124d11349ca0d7e117 \ " inherit kde-plasma gtk-icon-cache diff --git a/recipes-kde/plasma/untier/systemsettings/systemsettings.bb b/recipes-kde/plasma/untier/systemsettings/systemsettings.bb index 727c95bb..6d7128bb 100644 --- a/recipes-kde/plasma/untier/systemsettings/systemsettings.bb +++ b/recipes-kde/plasma/untier/systemsettings/systemsettings.bb @@ -1,8 +1,10 @@ SUMMARY = "KDE system settings" -LICENSE = "GPL-2.0 & GFDL-1.2" +LICENSE = "GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only & LGPL-2.0-only" LIC_FILES_CHKSUM = " \ - file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \ - file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \ + file://LICENSES/GPL-2.0-only.txt;md5=9e2385fe012386d34dcc5c9863070881 \ + file://LICENSES/GPL-2.0-or-later.txt;md5=9e2385fe012386d34dcc5c9863070881 \ + file://LICENSES/GPL-3.0-only.txt;md5=49fc03046e56a282c0c743b5d3a55b7c \ + file://LICENSES/LGPL-2.0-only.txt;md5=da48810c4ddf8e49efa031294a26b98c \ " inherit kde-plasma gettext