From 2f164c2333d3038c9b527e3beac161e39b060be8 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Wed, 27 Oct 2021 17:30:32 +0300
Subject: Canonicalize the license in the package manifests and source files

---
 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 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'libcmark-gfm-extensions')

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 <stdio.h>
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*' >'<p><del>Hi</del> Hello <em>world</em></p>'
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/}
-- 
cgit v1.1