From 2f40ef0c57f09f56b112ddbe18046a0f1da63231 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Fri, 2 Apr 2021 17:07:01 +0300 Subject: Canonicalize license in package manifests and source files --- TODO | 2 -- buildfile | 2 +- curl/build/bootstrap.build | 2 +- curl/build/export.build | 2 +- curl/build/root.build | 2 +- curl/buildfile | 2 +- curl/curl/buildfile | 2 +- curl/manifest | 2 +- curl/tests/build/bootstrap.build | 2 +- curl/tests/build/root.build | 2 +- curl/tests/buildfile | 2 +- curl/tests/http.testscript | 2 +- curl/tests/https.testscript | 2 +- libcurl/build/bootstrap.build | 2 +- libcurl/build/export.build | 2 +- libcurl/build/root.build | 2 +- libcurl/buildfile | 2 +- libcurl/libcurl/assert.c | 2 +- libcurl/libcurl/buildfile | 2 +- libcurl/libcurl/curl_config.h | 2 +- libcurl/manifest | 2 +- libcurl/tests/basic/buildfile | 2 +- libcurl/tests/basic/driver.c | 2 +- libcurl/tests/basic/testscript | 2 +- libcurl/tests/build/bootstrap.build | 2 +- libcurl/tests/build/root.build | 2 +- libcurl/tests/buildfile | 2 +- 27 files changed, 26 insertions(+), 28 deletions(-) diff --git a/TODO b/TODO index 7318efa..3f1112f 100644 --- a/TODO +++ b/TODO @@ -1,7 +1,5 @@ On the revision: -- Canonicalize the license in the package manifests. - - Fix the switch statements in the buildfiles, replacing 'switch $c.class, $tsys' with 'switch $c.class'. diff --git a/buildfile b/buildfile index d0e667b..67bed30 100644 --- a/buildfile +++ b/buildfile @@ -1,5 +1,5 @@ # file : buildfile -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file # Glue buildfile that "pulls" all the packages. diff --git a/curl/build/bootstrap.build b/curl/build/bootstrap.build index 194c20d..5b04660 100644 --- a/curl/build/bootstrap.build +++ b/curl/build/bootstrap.build @@ -1,5 +1,5 @@ # file : build/root.build -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file project = curl diff --git a/curl/build/export.build b/curl/build/export.build index dd03416..f887593 100644 --- a/curl/build/export.build +++ b/curl/build/export.build @@ -1,5 +1,5 @@ # file : build/export.build -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file $out_root/ { diff --git a/curl/build/root.build b/curl/build/root.build index 4c90074..e4a2753 100644 --- a/curl/build/root.build +++ b/curl/build/root.build @@ -1,5 +1,5 @@ # file : build/root.build -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file using c diff --git a/curl/buildfile b/curl/buildfile index fbdfe23..e6fae04 100644 --- a/curl/buildfile +++ b/curl/buildfile @@ -1,5 +1,5 @@ # file : buildfile -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file ./: {*/ -build/} doc{COPYING INSTALL README} manifest diff --git a/curl/curl/buildfile b/curl/curl/buildfile index 3bff067..2977f42 100644 --- a/curl/curl/buildfile +++ b/curl/curl/buildfile @@ -1,5 +1,5 @@ # file : curl/buildfile -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file import libs = libcurl%lib{curl} import libs += libca-certificates-curl%lib{ca-certificates-curl} diff --git a/curl/manifest b/curl/manifest index a3b185b..f1cc828 100644 --- a/curl/manifest +++ b/curl/manifest @@ -2,7 +2,7 @@ name: curl version: 7.76.0-a.0.z summary: Command line tool for transferring data with URLs -license: cURL ; MIT/X derivate license. +license: curl ; MIT/X derivate license. topics: HTTP, FTP, URL, data transfer description-file: README url: https://curl.se/ diff --git a/curl/tests/build/bootstrap.build b/curl/tests/build/bootstrap.build index b1c5f94..cd8314a 100644 --- a/curl/tests/build/bootstrap.build +++ b/curl/tests/build/bootstrap.build @@ -1,5 +1,5 @@ # file : tests/build/bootstrap.build -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file project = # Unnamed tests subproject. diff --git a/curl/tests/build/root.build b/curl/tests/build/root.build index d0f5667..5aff06b 100644 --- a/curl/tests/build/root.build +++ b/curl/tests/build/root.build @@ -1,5 +1,5 @@ # file : tests/build/root.build -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file # We need to configure C module to obtain the target information (see below). # diff --git a/curl/tests/buildfile b/curl/tests/buildfile index 1c3ad5d..332d4f0 100644 --- a/curl/tests/buildfile +++ b/curl/tests/buildfile @@ -1,4 +1,4 @@ # file : tests/buildfile -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file ./: testscript{*} file{empty.pem} $curl diff --git a/curl/tests/http.testscript b/curl/tests/http.testscript index c73bd23..aa96e06 100644 --- a/curl/tests/http.testscript +++ b/curl/tests/http.testscript @@ -1,5 +1,5 @@ # file : tests/http.testscript -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file : basic : diff --git a/curl/tests/https.testscript b/curl/tests/https.testscript index eb4aea1..fabdd69 100644 --- a/curl/tests/https.testscript +++ b/curl/tests/https.testscript @@ -1,5 +1,5 @@ # file : tests/https.testscript -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file : default : diff --git a/libcurl/build/bootstrap.build b/libcurl/build/bootstrap.build index 8d5d371..a84b3e7 100644 --- a/libcurl/build/bootstrap.build +++ b/libcurl/build/bootstrap.build @@ -1,5 +1,5 @@ # file : build/root.build -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file project = libcurl diff --git a/libcurl/build/export.build b/libcurl/build/export.build index 77bc612..3ead5b4 100644 --- a/libcurl/build/export.build +++ b/libcurl/build/export.build @@ -1,5 +1,5 @@ # file : build/root.build -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file $out_root/ { diff --git a/libcurl/build/root.build b/libcurl/build/root.build index 042c9d3..2a2c784 100644 --- a/libcurl/build/root.build +++ b/libcurl/build/root.build @@ -1,5 +1,5 @@ # file : build/root.build -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file using in diff --git a/libcurl/buildfile b/libcurl/buildfile index da9bfb2..ea34efa 100644 --- a/libcurl/buildfile +++ b/libcurl/buildfile @@ -1,5 +1,5 @@ # file : buildfile -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file # ./: {*/ -build/} doc{COPYING INSTALL README} manifest diff --git a/libcurl/libcurl/assert.c b/libcurl/libcurl/assert.c index 1cf9ac6..12160b2 100644 --- a/libcurl/libcurl/assert.c +++ b/libcurl/libcurl/assert.c @@ -1,5 +1,5 @@ /* file : libcurl/assert.c -*- C -*- - * license : cURL License; see accompanying COPYING file + * license : curl License; see accompanying COPYING file */ #include diff --git a/libcurl/libcurl/buildfile b/libcurl/libcurl/buildfile index 6d43ab0..21619b9 100644 --- a/libcurl/libcurl/buildfile +++ b/libcurl/libcurl/buildfile @@ -1,5 +1,5 @@ # file : libcurl/buildfile -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file # Version script. # diff --git a/libcurl/libcurl/curl_config.h b/libcurl/libcurl/curl_config.h index b659d12..3bebb85 100644 --- a/libcurl/libcurl/curl_config.h +++ b/libcurl/libcurl/curl_config.h @@ -1,5 +1,5 @@ /* file : libcurl/curl_config.h -*- C -*- - * license : cURL License; see accompanying COPYING file + * license : curl License; see accompanying COPYING file */ #ifndef LIBCURL_CURL_CONFIG_H diff --git a/libcurl/manifest b/libcurl/manifest index 4421765..304fbd7 100644 --- a/libcurl/manifest +++ b/libcurl/manifest @@ -3,7 +3,7 @@ name: libcurl version: 7.76.0-a.0.z project: curl summary: C library for transferring data with URLs -license: cURL ; MIT/X derivate license. +license: curl ; MIT/X derivate license. topics: C, HTTP, FTP, URL, data transfer description-file: README url: https://curl.se/ diff --git a/libcurl/tests/basic/buildfile b/libcurl/tests/basic/buildfile index 9dd8436..2495559 100644 --- a/libcurl/tests/basic/buildfile +++ b/libcurl/tests/basic/buildfile @@ -1,5 +1,5 @@ # file : tests/basic/buildfile -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file import libs = libcurl%lib{curl} diff --git a/libcurl/tests/basic/driver.c b/libcurl/tests/basic/driver.c index bc1e409..9bd7354 100644 --- a/libcurl/tests/basic/driver.c +++ b/libcurl/tests/basic/driver.c @@ -1,5 +1,5 @@ /* file : tests/basic/driver.c - * license : cURL License; see accompanying COPYING file + * license : curl License; see accompanying COPYING file */ #include #include diff --git a/libcurl/tests/basic/testscript b/libcurl/tests/basic/testscript index 2294ba0..85a2cff 100644 --- a/libcurl/tests/basic/testscript +++ b/libcurl/tests/basic/testscript @@ -1,5 +1,5 @@ # file : tests/basic/testscript -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file : http : diff --git a/libcurl/tests/build/bootstrap.build b/libcurl/tests/build/bootstrap.build index a776805..d32cc53 100644 --- a/libcurl/tests/build/bootstrap.build +++ b/libcurl/tests/build/bootstrap.build @@ -1,5 +1,5 @@ # file : tests/build/bootstrap.build -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file project = # Unnamed subproject. diff --git a/libcurl/tests/build/root.build b/libcurl/tests/build/root.build index 60fd379..08770bf 100644 --- a/libcurl/tests/build/root.build +++ b/libcurl/tests/build/root.build @@ -1,5 +1,5 @@ # file : tests/build/root.build -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file using c diff --git a/libcurl/tests/buildfile b/libcurl/tests/buildfile index 8b91020..78efeea 100644 --- a/libcurl/tests/buildfile +++ b/libcurl/tests/buildfile @@ -1,4 +1,4 @@ # file : tests/buildfile -# license : cURL License; see accompanying COPYING file +# license : curl License; see accompanying COPYING file ./: {*/ -build/} -- cgit v1.1