Skip to content

Commit

Permalink
Fix YAML notes format #74
Browse files Browse the repository at this point in the history
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
  • Loading branch information
pombredanne committed May 3, 2018
1 parent 10724b0 commit 7929d1f
Show file tree
Hide file tree
Showing 13 changed files with 105 additions and 63 deletions.
8 changes: 5 additions & 3 deletions src/licensedcode/data/rules/bsd-new_101.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
licenses:
- bsd-new
license_expression: bsd-new
notes: "In contrast with the main text, this version uses 3. [rescinded 22 July 1999] \nas\
\ opposed to 3. <deleted>. Since this is a bsd-original-uc with the advert claused removed,\n\
this becomes de facto a bsd-new"
notes: |
In contrast with the main text, this version uses
3. [rescinded 22 July 1999] as opposed to 3. <deleted>.
Since this is a bsd-original-uc with the advert
claused removed, this becomes de facto a bsd-new
19 changes: 12 additions & 7 deletions src/licensedcode/data/rules/gpl-2.0_101.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
licenses:
- gpl-2.0
license_expression: gpl-2.0
notes: "This is the next version of the GPL text as published by the FSF.\nLet's call it the\
\ GPL 2.0.1\nThis variation was published around December 2003 \nhttp://web.archive.org/web/20031202220858/http://www.fsf.org/copyleft/gpl.html\n\
It also the FSF move to Franklin Street and it refers to the Temple Place address\nand the\
\ GNU Library General Public License at the top and GNU Lesser General\nPublic License at\
\ the bottom. This show some split on which LGPL version is\nrecommened. Either 2.0 or 2.1.\n\
The corresponding text version at http://web.archive.org/web/20031203144405/http://www.fsf.org/copyleft/gpl.txt\n\
was not updated and still in force."
notes: |
This is the next version of the GPL text as published by the FSF.
Let's call it the GPL 2.0.1
This variation was published around December 2003
http://web.archive.org/web/20031202220858/http://www.fsf.org/copyleft/gpl.html
It also the FSF move to Franklin Street and it refers to the Temple Place address
and the GNU Library General Public License at the top and GNU Lesser General
Public License at the bottom. This show some split on which LGPL version is
recommened. Either 2.0 or 2.1.
The corresponding text version at
http://web.archive.org/web/20031203144405/http://www.fsf.org/copyleft/gpl.txt
was not updated and still in force.
21 changes: 13 additions & 8 deletions src/licensedcode/data/rules/gpl-2.0_102.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
licenses:
- gpl-2.0
license_expression: gpl-2.0
notes: "This is the next version of the GPL text as published by the FSF.\nLet's call it the\
\ GPL 2.0.2\nThis variation was published around about the time of the FSF office\nmove\
\ on May 1, 2005 from Temple Place to Franklin Street\nhttp://web.archive.org/web/20050507090312/http://www.fsf.org/licensing/licenses/gpl.html\n\
In this HTML version, it refers to the Franklin St address and uses the \nGNU Library General\
\ Public License at the top and GNU Lesser General Public License\nat the bottom with still\
\ a split opinion on which one to use of the LGPL 2 or 2.1\nThis is mostly about an address\
\ change.\nThe corresponding text version at\nhttp://web.archive.org/web/20050507090312/http://www.fsf.org/copyleft/gpl.txt\n\
was not updated for a few days."
notes: |
This is the next version of the GPL text as published by the FSF.
Let's call it the GPL 2.0.2
This variation was published around about the time of the FSF office
move on May 1, 2005 from Temple Place to Franklin Street
http://web.archive.org/web/20050507090312/http://www.fsf.org/licensing/licenses/gpl.html
In this HTML version, it refers to the Franklin St address and uses the
GNU Library General Public License at the top and GNU Lesser General Public License
at the bottom with still a split opinion on which one to use of the LGPL 2 or 2.1
This is mostly about an address change.
The corresponding text version at
http://web.archive.org/web/20050507090312/http://www.fsf.org/copyleft/gpl.txt
was not updated for a few days.
18 changes: 11 additions & 7 deletions src/licensedcode/data/rules/gpl-2.0_107.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
licenses:
- gpl-2.0
license_expression: gpl-2.0
notes: "This is the next version of the GPL text as published by the FSF.\nLet's call it the\
\ GPL 2.0.1\nThis variation was published around December 2003 \nhttp://web.archive.org/web/20031202220858/http://www.fsf.org/copyleft/gpl.html\n\
It also the FSF move to Franklin Street and it refers to the Temple Place address\nand the\
\ GNU Library General Public License at the top and GNU Lesser General\nPublic License at\
\ the bottom. This show some split on which LGPL version is\nrecommened. Either 2.0 or 2.1.\n\
The corresponding text version at http://web.archive.org/web/20031203144405/http://www.fsf.org/copyleft/gpl.txt\n\
was not updated and still in force."
notes: |
This is the next version of the GPL text as published by the FSF.
Let's call it the GPL 2.0.1
This variation was published around December 2003
http://web.archive.org/web/20031202220858/http://www.fsf.org/copyleft/gpl.html
It also the FSF move to Franklin Street and it refers to the Temple Place address
and theGNU Library General Public License at the top and GNU Lesser General
Public License atthe bottom. This show some split on which LGPL version is
recommened. Either 2.0 or 2.1.
The corresponding text version athttp://web.archive.org/web/20031203144405/http://www.fsf.org/copyleft/gpl.txt
was not updated and still in force.
19 changes: 12 additions & 7 deletions src/licensedcode/data/rules/gpl_52.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
licenses:
- gpl-1.0-plus
license_expression: gpl-1.0-plus
notes: "No version is specified in this notice found in ansiknr.c as redistributed\nwith automake\
\ in this RPM\n\nhttp://vault.centos.org/6.7/os/Source/SPackages/automake-1.11.1-4.el6.src.rpm\
\ \n\nThe original tarball for automake found in this RPM contains a GPL 2.0 text\nat the\
\ top-level and a GPL 3.0 text at the same level as ansiknr.c. Since\nansiknr.c copyright\
\ pre-dates the GPL 3.0 and the notice has no version\nstated, this rule is defined to match\
\ a bare GPL rather than a GPL 3.0. GPL\n3.0 is the license for automake proper and unlikely\
\ the license for\nansiknr.c."
notes: |
No version is specified in this notice found in ansiknr.c as redistributed
with automake in this RPM
http://vault.centos.org/6.7/os/Source/SPackages/automake-1.11.1-4.el6.src.rpm
The original tarball for automake found in this RPM contains a GPL 2.0 text
at the top-level and a GPL 3.0 text at the same level as ansiknr.c. Since
ansiknr.c copyright pre-dates the GPL 3.0 and the notice has no version
stated, this rule is defined to match a bare GPL rather than a GPL 3.0. GPL
3.0 is the license for automake proper and unlikely the license for
ansiknr.c.
5 changes: 3 additions & 2 deletions src/licensedcode/data/rules/hs-regexp-orig_2.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
licenses:
- hs-regexp-orig
license_expression: hs-regexp-orig
notes: "This is a rare almost identical variation on the license\nfound in curl Mac code. See\
\ \nhttps://github.com/bagder/curl/blob/master/src/macos/src/macos_main.cpp"
notes: |
This is a rare almost identical variation on the license\nfound in curl Mac code.
See https://github.com/bagder/curl/blob/master/src/macos/src/macos_main.cpp
13 changes: 9 additions & 4 deletions src/licensedcode/data/rules/ruby-2001-07-11.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
licenses:
- ruby
license_expression: ruby
notes: "This replaced the GPL COPYING file with the ruby dual licensing terms \nhttps://raw.githubusercontent.com/ruby/ruby/cbc3756009999e58d717af4fc82ba6c33bd3e7e6/COPYING\n\
Before this the ruby license was in the README\nhttps://github.com/ruby/ruby/blob/d0cf53ffb494469d40be95eb97decdb86c95f653/README\n\
and the bottom of section 4. was changed on a regular bassis to update the list\nof files\
\ and minor typos.\nThe Ruby license was first introduced there in early 1998\nhttps://github.com/ruby/ruby/blob/7ea2ceddb832b9973694fecac9fe3c30400735ba/README"
notes: |
This replaced the GPL COPYING file with the ruby dual licensing terms
https://raw.githubusercontent.com/ruby/ruby/cbc3756009999e58d717af4fc82ba6c33bd3e7e6/COPYING
Before this the ruby license was in the README
https://github.com/ruby/ruby/blob/d0cf53ffb494469d40be95eb97decdb86c95f653/README
and the bottom of section 4. was changed on a regular bassis to update the list
of files and minor typos.
The Ruby license was first introduced there in early 1998
https://github.com/ruby/ruby/blob/7ea2ceddb832b9973694fecac9fe3c30400735ba/README
13 changes: 9 additions & 4 deletions src/licensedcode/data/rules/ruby-2001-07-11_or_gpl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ licenses:
- gpl-2.0
license_choice: yes
license_expression: ruby OR gpl-2.0
notes: "This replaced the GPL COPYING file with the ruby dual licensing terms \nhttps://raw.githubusercontent.com/ruby/ruby/cbc3756009999e58d717af4fc82ba6c33bd3e7e6/COPYING\n\
Before this the ruby license was in the README\nhttps://github.com/ruby/ruby/blob/d0cf53ffb494469d40be95eb97decdb86c95f653/README\n\
and the bottom of section 4. was changed on a regular bassis to update the list\nof files\
\ and minor typos.\nThe Ruby license was first introduced there in early 1998\nhttps://github.com/ruby/ruby/blob/7ea2ceddb832b9973694fecac9fe3c30400735ba/README"
notes: |
This replaced the GPL COPYING file with the ruby dual licensing terms
https://raw.githubusercontent.com/ruby/ruby/cbc3756009999e58d717af4fc82ba6c33bd3e7e6/COPYING
Before this the ruby license was in the README
https://github.com/ruby/ruby/blob/d0cf53ffb494469d40be95eb97decdb86c95f653/README
and the bottom of section 4. was changed on a regular bassis to update the list
of files and minor typos.
The Ruby license was first introduced there in early 1998
https://github.com/ruby/ruby/blob/7ea2ceddb832b9973694fecac9fe3c30400735ba/README
17 changes: 11 additions & 6 deletions src/licensedcode/data/rules/ruby-2001-07-13.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
licenses:
- ruby
license_expression: ruby
notes: "https://raw.githubusercontent.com/ruby/ruby/c5a7e3570690f1a6570cc3cb1876f5f77a20fe3c/COPYING\n\
\nThis replaced the GPL COPYING file with the ruby dual licensing terms \nThis came just\
\ after a short lived modification that lived only for 2 days\nhttps://raw.githubusercontent.com/ruby/ruby/cbc3756009999e58d717af4fc82ba6c33bd3e7e6/COPYING\n\
Before this the ruby license was in the README\nhttps://github.com/ruby/ruby/blob/d0cf53ffb494469d40be95eb97decdb86c95f653/README\n\
and the bottom of section 4. was changed on a regular bassis to update the list\nof files\
\ and minor typos.\nThe Ruby license was first introduced there in early 1998\nhttps://github.com/ruby/ruby/blob/7ea2ceddb832b9973694fecac9fe3c30400735ba/README"
notes: |
https://raw.githubusercontent.com/ruby/ruby/c5a7e3570690f1a6570cc3cb1876f5f77a20fe3c/COPYING
This replaced the GPL COPYING file with the ruby dual licensing terms
This came just\ after a short lived modification that lived only for 2 days
https://raw.githubusercontent.com/ruby/ruby/cbc3756009999e58d717af4fc82ba6c33bd3e7e6/COPYING
Before this the ruby license was in the README
https://github.com/ruby/ruby/blob/d0cf53ffb494469d40be95eb97decdb86c95f653/README
and the bottom of section 4. was changed on a regular bassis to update the list
of files\ and minor typos.
The Ruby license was first introduced there in early 1998
https://github.com/ruby/ruby/blob/7ea2ceddb832b9973694fecac9fe3c30400735ba/README
17 changes: 11 additions & 6 deletions src/licensedcode/data/rules/ruby-2001-07-13_or_gpl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,14 @@ licenses:
- gpl-2.0
license_choice: yes
license_expression: ruby OR gpl-2.0
notes: "https://raw.githubusercontent.com/ruby/ruby/c5a7e3570690f1a6570cc3cb1876f5f77a20fe3c/COPYING\n\
\nThis replaced the GPL COPYING file with the ruby dual licensing terms \nThis came just\
\ after a short lived modification that lived only for 2 days\nhttps://raw.githubusercontent.com/ruby/ruby/cbc3756009999e58d717af4fc82ba6c33bd3e7e6/COPYING\n\
Before this the ruby license was in the README\nhttps://github.com/ruby/ruby/blob/d0cf53ffb494469d40be95eb97decdb86c95f653/README\n\
and the bottom of section 4. was changed on a regular bassis to update the list\nof files\
\ and minor typos.\nThe Ruby license was first introduced there in early 1998\nhttps://github.com/ruby/ruby/blob/7ea2ceddb832b9973694fecac9fe3c30400735ba/README"
notes: |
https://raw.githubusercontent.com/ruby/ruby/c5a7e3570690f1a6570cc3cb1876f5f77a20fe3c/COPYING
This replaced the GPL COPYING file with the ruby dual licensing terms
This came just after a short lived modification that lived only for 2 days
https://raw.githubusercontent.com/ruby/ruby/cbc3756009999e58d717af4fc82ba6c33bd3e7e6/COPYING
Before this the ruby license was in the README
https://github.com/ruby/ruby/blob/d0cf53ffb494469d40be95eb97decdb86c95f653/README
and the bottom of section 4. was changed on a regular bassis to update the list
of files and minor typos.
The Ruby license was first introduced there in early 1998
https://github.com/ruby/ruby/blob/7ea2ceddb832b9973694fecac9fe3c30400735ba/README
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ holders_summary:
- Cohesive Financial Technologies
- Rabbit Technologies
- Simon Mourier
notes: " These are missing the trailing: and Rabbit Technologies Ltd.\n 'Copyright\
\ (c) 2007, 2008 LShift Ltd. , Cohesive Financial Technologies LLC.', # , and Rabbit Technologies\
\ Ltd.',\n 'Copyright (c) 2007 LShift Ltd. , Cohesive Financial Technologies\
\ LLC.', # , and Rabbit Technologies Ltd.',\n "
notes: |
These are missing the trailing: and Rabbit Technologies Ltd.
Copyright (c) 2007, 2008 LShift Ltd. , Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.
Copyright (c) 2007 LShift Ltd. , Cohesive Financial Technologies LLC.', and Rabbit Technologies Ltd.
4 changes: 2 additions & 2 deletions tests/licensedcode/data/licenses/gpl-2.0_25.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ licenses:
- gpl-2.0
license_expressions:
- gpl-2.0
notes: " The hex resolves to GPL v2\r\n\r\n \"\\x47\\x50\\x4c\\x20\\x76\\x32\"\r\n\
\ 'GPL v2'\r\n\r\n"
notes: |
The hex "\x47\x50\x4c\x20\x76\x32" resolves to "GPL v2"
6 changes: 3 additions & 3 deletions tests/licensedcode/data/licenses/srgb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ licenses:
- srgb
license_expressions:
- srgb
notes: "Copyright (c) 1998 Hewlett-Packard Company. \r\n\r\nVery similar to OSF 1990 License\
\ except for this line \"provided that the file is not changed including the HP copyright\
\ notice tag,\""
notes: |
Very similar to OSF 1990 License except for this line:
provided that the file is not changed including the HP copyright notice tag

0 comments on commit 7929d1f

Please sign in to comment.