From 2f164c2333d3038c9b527e3beac161e39b060be8 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 27 Oct 2021 17:30:32 +0300 Subject: Canonicalize the license in the package manifests and source files --- TODO | 2 -- buildfile | 2 +- libcmark-gfm-extensions/build/bootstrap.build | 2 +- libcmark-gfm-extensions/build/root.build | 2 +- libcmark-gfm-extensions/buildfile | 2 +- libcmark-gfm-extensions/libcmark-gfm-extensions/buildfile | 2 +- .../libcmark-gfm-extensions/cmark-gfm-extensions_export.h | 2 +- libcmark-gfm-extensions/manifest | 2 +- libcmark-gfm-extensions/tests/basic/buildfile | 2 +- libcmark-gfm-extensions/tests/basic/driver.c | 2 +- libcmark-gfm-extensions/tests/basic/testscript | 2 +- libcmark-gfm-extensions/tests/build/bootstrap.build | 2 +- libcmark-gfm-extensions/tests/build/root.build | 2 +- libcmark-gfm-extensions/tests/buildfile | 2 +- libcmark-gfm/build/bootstrap.build | 2 +- libcmark-gfm/build/root.build | 2 +- libcmark-gfm/buildfile | 2 +- libcmark-gfm/libcmark-gfm/buildfile | 2 +- libcmark-gfm/libcmark-gfm/cmark-gfm_export.h | 2 +- libcmark-gfm/libcmark-gfm/cmark-gfm_version.h | 2 +- libcmark-gfm/manifest | 2 +- libcmark-gfm/tests/basic/buildfile | 2 +- libcmark-gfm/tests/basic/driver.c | 2 +- libcmark-gfm/tests/basic/testscript | 2 +- libcmark-gfm/tests/build/bootstrap.build | 2 +- libcmark-gfm/tests/build/root.build | 2 +- libcmark-gfm/tests/buildfile | 2 +- 27 files changed, 26 insertions(+), 28 deletions(-) diff --git a/TODO b/TODO index a91a4ee..da80960 100644 --- a/TODO +++ b/TODO @@ -1,7 +1,5 @@ On the revision: -- Canonicalize the license in the package manifests. - On the release: - Use legal{} target type for legal documentation (LICENSE, AUTHORS, etc). diff --git a/buildfile b/buildfile index bcbde75..805f5f0 100644 --- a/buildfile +++ b/buildfile @@ -1,5 +1,5 @@ # file : buildfile -# license : FreeBSD License; see accompanying COPYING file +# license : BSD 2-Clause "Simplified" License; see accompanying COPYING file # Glue buildfile that "pulls" all the packages. diff --git a/libcmark-gfm-extensions/build/bootstrap.build b/libcmark-gfm-extensions/build/bootstrap.build index b513d63..8f66880 100644 --- a/libcmark-gfm-extensions/build/bootstrap.build +++ b/libcmark-gfm-extensions/build/bootstrap.build @@ -1,5 +1,5 @@ # file : build/bootstrap.build -# license : FreeBSD License; see accompanying COPYING file +# license : BSD 2-Clause "Simplified" License; see accompanying COPYING file project = libcmark-gfm-extensions diff --git a/libcmark-gfm-extensions/build/root.build b/libcmark-gfm-extensions/build/root.build index 6190d37..2dddc83 100644 --- a/libcmark-gfm-extensions/build/root.build +++ b/libcmark-gfm-extensions/build/root.build @@ -1,5 +1,5 @@ # file : build/root.build -# license : FreeBSD License; see accompanying COPYING file +# license : BSD 2-Clause "Simplified" License; see accompanying COPYING file c.std = 99 diff --git a/libcmark-gfm-extensions/buildfile b/libcmark-gfm-extensions/buildfile index 5841f11..fbbaab8 100644 --- a/libcmark-gfm-extensions/buildfile +++ b/libcmark-gfm-extensions/buildfile @@ -1,5 +1,5 @@ # file : buildfile -# license : FreeBSD License; see accompanying COPYING file +# license : BSD 2-Clause "Simplified" License; see accompanying COPYING file ./: {*/ -build/} doc{COPYING INSTALL README} manifest diff --git a/libcmark-gfm-extensions/libcmark-gfm-extensions/buildfile b/libcmark-gfm-extensions/libcmark-gfm-extensions/buildfile index c6dadb2..76e0df9 100644 --- a/libcmark-gfm-extensions/libcmark-gfm-extensions/buildfile +++ b/libcmark-gfm-extensions/libcmark-gfm-extensions/buildfile @@ -1,5 +1,5 @@ # file : libcmark-gfm-extensions/buildfile -# license : FreeBSD License; see accompanying COPYING file +# license : BSD 2-Clause "Simplified" License; see accompanying COPYING file import int_libs = libcmark-gfm%lib{cmark-gfm} diff --git a/libcmark-gfm-extensions/libcmark-gfm-extensions/cmark-gfm-extensions_export.h b/libcmark-gfm-extensions/libcmark-gfm-extensions/cmark-gfm-extensions_export.h index d02783a..33f4de2 100644 --- a/libcmark-gfm-extensions/libcmark-gfm-extensions/cmark-gfm-extensions_export.h +++ b/libcmark-gfm-extensions/libcmark-gfm-extensions/cmark-gfm-extensions_export.h @@ -1,5 +1,5 @@ /* file : libcmark-gfm-extensions/cmark-gfm-extensions_export.h -*- C -*- - * license : FreeBSD License; see accompanying COPYING file + * license : BSD 2-Clause "Simplified" License; see accompanying COPYING file */ #ifndef CMARK_GFM_EXTENSIONS_EXPORT_H diff --git a/libcmark-gfm-extensions/manifest b/libcmark-gfm-extensions/manifest index daf524f..00b475e 100644 --- a/libcmark-gfm-extensions/manifest +++ b/libcmark-gfm-extensions/manifest @@ -9,7 +9,7 @@ upstream-version: 0.29.0.gfm.2 project: cmark-gfm priority: security summary: GitHub-flavored CommonMark extensions C library -license: BSD2; Simplified 2-clause BSD License. +license: BSD-2-Clause AND MIT ; BSD 2-Clause "Simplified" License for the most of original files. topics: C, CommonMark, Markdown, documentation generation description-file: README url: https://github.com/github/cmark-gfm diff --git a/libcmark-gfm-extensions/tests/basic/buildfile b/libcmark-gfm-extensions/tests/basic/buildfile index 5222a80..f8f7f09 100644 --- a/libcmark-gfm-extensions/tests/basic/buildfile +++ b/libcmark-gfm-extensions/tests/basic/buildfile @@ -1,5 +1,5 @@ # file : tests/basic/buildfile -# license : FreeBSD License; see accompanying COPYING file +# license : BSD 2-Clause "Simplified" License; see accompanying COPYING file import libs = libcmark-gfm-extensions%lib{cmark-gfm-extensions} import libs += libcmark-gfm%lib{cmark-gfm} diff --git a/libcmark-gfm-extensions/tests/basic/driver.c b/libcmark-gfm-extensions/tests/basic/driver.c index ca6f475..ccffb39 100644 --- a/libcmark-gfm-extensions/tests/basic/driver.c +++ b/libcmark-gfm-extensions/tests/basic/driver.c @@ -1,5 +1,5 @@ /* file : tests/basic/driver.c - * license : FreeBSD License; see accompanying COPYING file + * license : BSD 2-Clause "Simplified" License; see accompanying COPYING file */ #include diff --git a/libcmark-gfm-extensions/tests/basic/testscript b/libcmark-gfm-extensions/tests/basic/testscript index 5d38bc5..b0690bf 100644 --- a/libcmark-gfm-extensions/tests/basic/testscript +++ b/libcmark-gfm-extensions/tests/basic/testscript @@ -1,4 +1,4 @@ # file : tests/basic/testscript -# license : FreeBSD License; see accompanying COPYING file +# license : BSD 2-Clause "Simplified" License; see accompanying COPYING file $* '~~Hi~~ Hello *world*' >'

Hi Hello world

' diff --git a/libcmark-gfm-extensions/tests/build/bootstrap.build b/libcmark-gfm-extensions/tests/build/bootstrap.build index d8223b6..1f99120 100644 --- a/libcmark-gfm-extensions/tests/build/bootstrap.build +++ b/libcmark-gfm-extensions/tests/build/bootstrap.build @@ -1,5 +1,5 @@ # file : tests/build/bootstrap.build -# license : FreeBSD License; see accompanying COPYING file +# license : BSD 2-Clause "Simplified" License; see accompanying COPYING file project = # Unnamed tests subproject. diff --git a/libcmark-gfm-extensions/tests/build/root.build b/libcmark-gfm-extensions/tests/build/root.build index 36b5207..06f65d4 100644 --- a/libcmark-gfm-extensions/tests/build/root.build +++ b/libcmark-gfm-extensions/tests/build/root.build @@ -1,5 +1,5 @@ # file : tests/build/root.build -# license : FreeBSD License; see accompanying COPYING file +# license : BSD 2-Clause "Simplified" License; see accompanying COPYING file using c diff --git a/libcmark-gfm-extensions/tests/buildfile b/libcmark-gfm-extensions/tests/buildfile index 8c4d0c3..4551d45 100644 --- a/libcmark-gfm-extensions/tests/buildfile +++ b/libcmark-gfm-extensions/tests/buildfile @@ -1,4 +1,4 @@ # file : tests/buildfile -# license : FreeBSD License; see accompanying COPYING file +# license : BSD 2-Clause "Simplified" License; see accompanying COPYING file ./: {*/ -build/} diff --git a/libcmark-gfm/build/bootstrap.build b/libcmark-gfm/build/bootstrap.build index c8a159c..48f1937 100644 --- a/libcmark-gfm/build/bootstrap.build +++ b/libcmark-gfm/build/bootstrap.build @@ -1,5 +1,5 @@ # file : build/bootstrap.build -# license : FreeBSD License; see accompanying COPYING file +# license : BSD 2-Clause "Simplified" License; see accompanying COPYING file project = libcmark-gfm diff --git a/libcmark-gfm/build/root.build b/libcmark-gfm/build/root.build index 89e681b..d437527 100644 --- a/libcmark-gfm/build/root.build +++ b/libcmark-gfm/build/root.build @@ -1,5 +1,5 @@ # file : build/root.build -# license : FreeBSD License; see accompanying COPYING file +# license : BSD 2-Clause "Simplified" License; see accompanying COPYING file using in diff --git a/libcmark-gfm/buildfile b/libcmark-gfm/buildfile index 5841f11..fbbaab8 100644 --- a/libcmark-gfm/buildfile +++ b/libcmark-gfm/buildfile @@ -1,5 +1,5 @@ # file : buildfile -# license : FreeBSD License; see accompanying COPYING file +# license : BSD 2-Clause "Simplified" License; see accompanying COPYING file ./: {*/ -build/} doc{COPYING INSTALL README} manifest diff --git a/libcmark-gfm/libcmark-gfm/buildfile b/libcmark-gfm/libcmark-gfm/buildfile index 8d0ccfb..5c4ec19 100644 --- a/libcmark-gfm/libcmark-gfm/buildfile +++ b/libcmark-gfm/libcmark-gfm/buildfile @@ -1,5 +1,5 @@ # file : libcmark-gfm/buildfile -# license : FreeBSD License; see accompanying COPYING file +# license : BSD 2-Clause "Simplified" License; see accompanying COPYING file define inc: file inc{*}: extension = inc diff --git a/libcmark-gfm/libcmark-gfm/cmark-gfm_export.h b/libcmark-gfm/libcmark-gfm/cmark-gfm_export.h index ca72d98..da3fde7 100644 --- a/libcmark-gfm/libcmark-gfm/cmark-gfm_export.h +++ b/libcmark-gfm/libcmark-gfm/cmark-gfm_export.h @@ -1,5 +1,5 @@ /* file : libcmark-gfm/cmark-gfm_export.h -*- C -*- - * license : FreeBSD License; see accompanying COPYING file + * license : BSD 2-Clause "Simplified" License; see accompanying COPYING file */ #ifndef CMARK_GFM_EXPORT_H diff --git a/libcmark-gfm/libcmark-gfm/cmark-gfm_version.h b/libcmark-gfm/libcmark-gfm/cmark-gfm_version.h index 1b7b67b..e64ccf6 100644 --- a/libcmark-gfm/libcmark-gfm/cmark-gfm_version.h +++ b/libcmark-gfm/libcmark-gfm/cmark-gfm_version.h @@ -1,5 +1,5 @@ /* file : libcmark-gfm/cmark-gfm_version.h - * license : FreeBSD License; see accompanying COPYING file + * license : BSD 2-Clause "Simplified" License; see accompanying COPYING file */ #include diff --git a/libcmark-gfm/manifest b/libcmark-gfm/manifest index 8257a8c..538bfa8 100644 --- a/libcmark-gfm/manifest +++ b/libcmark-gfm/manifest @@ -9,7 +9,7 @@ upstream-version: 0.29.0.gfm.2 project: cmark-gfm priority: security summary: GitHub-flavored CommonMark parsing and rendering C library -license: BSD2; Simplified 2-clause BSD License. +license: BSD-2-Clause AND MIT ; BSD 2-Clause "Simplified" License for the most of original files. topics: C, CommonMark, Markdown, documentation generation description-file: README url: https://github.com/github/cmark-gfm diff --git a/libcmark-gfm/tests/basic/buildfile b/libcmark-gfm/tests/basic/buildfile index 62d766a..d9a0279 100644 --- a/libcmark-gfm/tests/basic/buildfile +++ b/libcmark-gfm/tests/basic/buildfile @@ -1,5 +1,5 @@ # file : tests/basic/buildfile -# license : FreeBSD License; see accompanying COPYING file +# license : BSD 2-Clause "Simplified" License; see accompanying COPYING file import libs = libcmark-gfm%lib{cmark-gfm} diff --git a/libcmark-gfm/tests/basic/driver.c b/libcmark-gfm/tests/basic/driver.c index c093f71..da60823 100644 --- a/libcmark-gfm/tests/basic/driver.c +++ b/libcmark-gfm/tests/basic/driver.c @@ -1,5 +1,5 @@ /* file : tests/basic/driver.c - * license : FreeBSD License; see accompanying COPYING file + * license : BSD 2-Clause "Simplified" License; see accompanying COPYING file */ #include diff --git a/libcmark-gfm/tests/basic/testscript b/libcmark-gfm/tests/basic/testscript index 003d5e9..53eecdd 100644 --- a/libcmark-gfm/tests/basic/testscript +++ b/libcmark-gfm/tests/basic/testscript @@ -1,4 +1,4 @@ # file : tests/basic/testscript -# license : FreeBSD License; see accompanying COPYING file +# license : BSD 2-Clause "Simplified" License; see accompanying COPYING file $* 'Hello *world*' >'

Hello world

' diff --git a/libcmark-gfm/tests/build/bootstrap.build b/libcmark-gfm/tests/build/bootstrap.build index d8223b6..1f99120 100644 --- a/libcmark-gfm/tests/build/bootstrap.build +++ b/libcmark-gfm/tests/build/bootstrap.build @@ -1,5 +1,5 @@ # file : tests/build/bootstrap.build -# license : FreeBSD License; see accompanying COPYING file +# license : BSD 2-Clause "Simplified" License; see accompanying COPYING file project = # Unnamed tests subproject. diff --git a/libcmark-gfm/tests/build/root.build b/libcmark-gfm/tests/build/root.build index 36b5207..06f65d4 100644 --- a/libcmark-gfm/tests/build/root.build +++ b/libcmark-gfm/tests/build/root.build @@ -1,5 +1,5 @@ # file : tests/build/root.build -# license : FreeBSD License; see accompanying COPYING file +# license : BSD 2-Clause "Simplified" License; see accompanying COPYING file using c diff --git a/libcmark-gfm/tests/buildfile b/libcmark-gfm/tests/buildfile index 8c4d0c3..4551d45 100644 --- a/libcmark-gfm/tests/buildfile +++ b/libcmark-gfm/tests/buildfile @@ -1,4 +1,4 @@ # file : tests/buildfile -# license : FreeBSD License; see accompanying COPYING file +# license : BSD 2-Clause "Simplified" License; see accompanying COPYING file ./: {*/ -build/} -- cgit v1.1