Skip to content

Commit

Permalink
Attempt to cleanup the mess with the licensing. Switch to Expat in fa…
Browse files Browse the repository at this point in the history
…vor of GPL3+ because otherwise the result would not have been distributed at all due to OFL and GPL incompatibility in event of the font data not being loaded from a separate file. See FortAwesome/Font-Awesome#1124
  • Loading branch information
m7a committed Jan 20, 2024
1 parent d40fbc6 commit aa04b04
Show file tree
Hide file tree
Showing 4 changed files with 96 additions and 725 deletions.
32 changes: 27 additions & 5 deletions LICENSE-THIRDPARTY.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
==================================================== Overview (INFORMATIONAL) ==
================================================================================

See next sections for actual license contents

* Component - Copyright String Excerpt - License Keywords

* Ma_Sys.ma DCF77 VFD Raspi Clock
- Copyright (c) 2018-2024 Ma_Sys.ma - Expat
* Terminus Font - Copyright (c) 2010-2014
Dimitar Toshkov Zhekov - OFL 1.1
* Ada on RPI 2040 Pico
Expand Down Expand Up @@ -121,10 +120,33 @@ BSD 3-Clause License
Copyright (c) 2021, Fabien Chouteau
All rights reserved.

(same license text as preceding entry)
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

================================================================================
===================================================== src/dcf77_display.ads ==
================================================ src/dcf77_display-font.ads ==
================================================================================

Terminus Font is licensed under the SIL Open Font License, Version 1.1.
Expand Down
Loading

0 comments on commit aa04b04

Please sign in to comment.