Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

license: Move to SPDX expressions #460

Merged
merged 1 commit into from
Aug 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ set (KCOV_INSTALL_DOCDIR "share/doc/kcov" CACHE STRING "Install destination for
set (KCOV_INSTALL_MANDIR "share/man" CACHE STRING "Install destination for man documentation")
mark_as_advanced (KCOV_INSTALL_BINDIR KCOV_INSTALL_DOCDIR KCOV_INSTALL_MANDIR)

install (FILES ChangeLog COPYING COPYING.externals
install (FILES ChangeLog COPYING COPYING.spdx
DESTINATION "${KCOV_INSTALL_DOCDIR}")

# ====================================
Expand Down
3 changes: 0 additions & 3 deletions COPYING.externals

This file was deleted.

4 changes: 4 additions & 0 deletions COPYING.spdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
kcov: GPL-2.0-only
handlebars.js: MIT
tablesorter (mottie): GPL-2.0-only OR MIT
jquery: MIT
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ LABEL org.label-schema.vendor="Kcov" \
org.opencontainers.image.documentation="https://github.com/SimonKagstrom/kcov#readme" \
org.opencontainers.image.source="https://github.com/SimonKagstrom/kcov" \
org.opencontainers.image.vendor="Kcov" \
org.opencontainers.image.licenses="GPL-2.0" \
org.opencontainers.image.licenses="GPL-2.0-only AND MIT AND (GPL-2.0-only OR MIT)" \
org.opencontainers.image.created=${BUILD_DATE} \
org.opencontainers.image.version=${RELEASE_VERSION} \
org.opencontainers.image.revision=${VCS_REF}
Expand Down
Loading