aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/libs
diff options
context:
space:
mode:
authorAlexander Smirnov <alex@ydb.tech>2025-02-11 20:29:53 +0000
committerAlexander Smirnov <alex@ydb.tech>2025-02-11 20:29:53 +0000
commit4bdabbd7eb595af083177ea9a1bb5244eaf165fb (patch)
tree1b56513cd85aacebfa73eb031b992a4e9431e3a4 /contrib/libs
parent0bddb357f794f66df06b7f5043052234729cfc73 (diff)
parent47a420488a36ef5d1a8bae46259c0085c5a27fdb (diff)
downloadydb-4bdabbd7eb595af083177ea9a1bb5244eaf165fb.tar.gz
Merge branch 'rightlib' into merge-libs-250211-2028
Diffstat (limited to 'contrib/libs')
-rw-r--r--contrib/libs/dtl/.yandex_meta/devtools.licenses.report6
-rw-r--r--contrib/libs/dtl/.yandex_meta/licenses.list.txt22
-rw-r--r--contrib/libs/dtl/ya.make5
3 files changed, 15 insertions, 18 deletions
diff --git a/contrib/libs/dtl/.yandex_meta/devtools.licenses.report b/contrib/libs/dtl/.yandex_meta/devtools.licenses.report
index 23c4410c90..03e5b497fb 100644
--- a/contrib/libs/dtl/.yandex_meta/devtools.licenses.report
+++ b/contrib/libs/dtl/.yandex_meta/devtools.licenses.report
@@ -33,7 +33,7 @@
# FILE_INCLUDE - include all file data into licenses text file
# =======================
-KEEP LicenseRef-scancode-unknown-license-reference 27ff83b6d7e95b709c1a8b94532ebef1
+KEEP BSD-3-Clause 27ff83b6d7e95b709c1a8b94532ebef1
BELONGS ya.make
License text:
Please read the file [COPYING](https://github.com/cubicdaiya/dtl/blob/master/COPYING).
@@ -45,7 +45,7 @@ BELONGS ya.make
Files with this license:
README.md [685:685]
-KEEP LicenseRef-scancode-unknown-license-reference AND BSD-3-Clause 3d436eacb955b50a8f94435e0ba12145
+KEEP BSD-3-Clause 3d436eacb955b50a8f94435e0ba12145
BELONGS ya.make
License text:
In short, Diff Template Library is distributed under so called "BSD license",
@@ -90,7 +90,7 @@ FILE_INCLUDE CONTRIBUTORS found in files: COPYING at line 20, COPYING at line 24
Files with this license:
COPYING [6:30]
-KEEP LicenseRef-scancode-unknown-license-reference AND BSD-3-Clause d9ebc19a46340bfaf128a098aade97ed
+KEEP BSD-3-Clause d9ebc19a46340bfaf128a098aade97ed
BELONGS ya.make
License text:
In short, Diff Template Library is distributed under so called "BSD license",
diff --git a/contrib/libs/dtl/.yandex_meta/licenses.list.txt b/contrib/libs/dtl/.yandex_meta/licenses.list.txt
index 523a76b40a..bbec30e822 100644
--- a/contrib/libs/dtl/.yandex_meta/licenses.list.txt
+++ b/contrib/libs/dtl/.yandex_meta/licenses.list.txt
@@ -1,4 +1,8 @@
====================BSD-3-Clause====================
+ In short, Diff Template Library is distributed under so called "BSD license",
+
+
+====================BSD-3-Clause====================
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
@@ -27,6 +31,13 @@
====================BSD-3-Clause====================
+In short, Diff Template Library is distributed under so called "BSD license",
+
+
+====================BSD-3-Clause====================
+Please read the file [COPYING](https://github.com/cubicdaiya/dtl/blob/master/COPYING).
+
+====================BSD-3-Clause====================
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
@@ -61,14 +72,3 @@ All rights reserved.
====================File: CONTRIBUTORS====================
Tatsuhiko Kubo <cubicdaiya@gmail.com>
Jan Weiß <jan@geheimwerk.de>
-
-
-====================LicenseRef-scancode-unknown-license-reference====================
-Please read the file [COPYING](https://github.com/cubicdaiya/dtl/blob/master/COPYING).
-
-====================LicenseRef-scancode-unknown-license-reference AND BSD-3-Clause====================
- In short, Diff Template Library is distributed under so called "BSD license",
-
-
-====================LicenseRef-scancode-unknown-license-reference AND BSD-3-Clause====================
-In short, Diff Template Library is distributed under so called "BSD license",
diff --git a/contrib/libs/dtl/ya.make b/contrib/libs/dtl/ya.make
index 8e61f56df4..417881c9f6 100644
--- a/contrib/libs/dtl/ya.make
+++ b/contrib/libs/dtl/ya.make
@@ -2,10 +2,7 @@
LIBRARY()
-LICENSE(
- BSD-3-Clause AND
- LicenseRef-scancode-unknown-license-reference
-)
+LICENSE(BSD-3-Clause)
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)