[education/blinken/release/26.08] /: Use an actual SPDX ID and not a custom one
Albert Astals Cid <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 179a2d32397013bee2cc60a5250d5bdcf49d7c21 by Albert Astals Cid, on behalf of Jo Jöns. Committed on 03/08/2026 at 22:07. Pushed by aacid into branch 'release/26.08'. Use an actual SPDX ID and not a custom one The text in `LicenseRef-SJFonts.txt` is the same as the spdx license `Font-exception-2.0` so make use of that one. (cherry picked from commit 0fa49a8700a1b6b5c5f620bf887417f7f3e28857) R +0 -10 LICENSES/Font-exception-2.0.txt [from: LICENSES/LicenseRef-SJFonts.txt - 067% similarity] M +1 -1 fonts/steve.ttf.license https://invent.kde.org/education/blinken/-/commit/179a2d32397013bee2cc60a5250d5bdcf49d7c21 diff --git a/LICENSES/LicenseRef-SJFonts.txt b/LICENSES/Font-exception-2.0.txt similarity index 67% rename from LICENSES/LicenseRef-SJFonts.txt rename to LICENSES/Font-exception-2.0.txt index 9f299e5..3c51b1b 100644 --- a/LICENSES/LicenseRef-SJFonts.txt +++ b/LICENSES/Font-exception-2.0.txt @@ -1,13 +1,3 @@ -fonts/steve.ttf was downloaded from http://sf.net/projects/sjfonts/ - -Copyright Holder: Steve JORDI steve @ sjordi.com - -License: - -SJFonts are licensed under the GNU General Public License version 2 or -later (see LICENSES/GPL-2.0-or-later.txt file) but with the following -exception: - As a special exception, if you create a document which uses this font, and embed this font or unaltered portions of this font into the document, this font does not by itself cause the resulting document to be covered by diff --git a/fonts/steve.ttf.license b/fonts/steve.ttf.license index 2f148a0..b2e6932 100644 --- a/fonts/steve.ttf.license +++ b/fonts/steve.ttf.license @@ -1,2 +1,2 @@ SPDX-FileCopyrightText: Steve JORDI <steve @ sjordi.com> -SPDX-License-Identifier: GPL-2.0-or-later OR LicenseRef-SJFonts +SPDX-License-Identifier: GPL-2.0-or-later WITH Font-exception-2.0