Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cargo.toml: Replace '/' with 'OR' in 'license' #16

Merged
merged 1 commit into from
Jan 11, 2018

Conversation

wking
Copy link
Contributor

@wking wking commented Jan 11, 2018

Catch up with the recommendations from rust-lang/cargo#4898, which deprecated '/' in favor of vanilla SPDX license expressions.

See #14 for previous discussion and sign-offs from most existing contributors.

@nodakai, I'd still like to hear from you about your licensing intentions with #8 (and your open PRs).

Fixes #14.

Catch up with the recommendations from rust-lang/cargo@7dee65fe
(src/doc/manifest: Pin 'license' to SPDX 2.1 expressions and the 2.4
list, 2018-01-04, rust-lang/cargo#4898), which deprecated '/' in favor
of vanilla SPDX license expressions.

I've gone with the disjunctive OR, and most contributors have signed
off on that change:

* Without Boats wanted to match the crates.io licensing [1], and they
  meant OR [2].
* Rodolphe Breard [3], Laurence Tratt [4], and Kai NODA [5] intended
  OR.

[1]: ehuss#14 (comment)
[2]: rust-lang/crates.io#1226
[3]: ehuss#14 (comment)
[4]: ehuss#14 (comment)
[5]: ehuss#14 (comment)
@wking wking force-pushed the license-expression-for-us branch from c8f2219 to 37a39a6 Compare January 11, 2018 17:21
@wking
Copy link
Contributor Author

wking commented Jan 11, 2018

Got the green light from @nodakai, so we're good to go here.

@wking wking merged commit 37a39a6 into ehuss:master Jan 11, 2018
@wking wking deleted the license-expression-for-us branch January 11, 2018 17:23
wking added a commit to wking/license-exprs that referenced this pull request Jun 18, 2018
Changes since v1.3.0:

* Updated SPDX License List to 3.1 (ehuss#9, ehuss#11, ehuss#17, ehuss#19, ehuss#24)
* Updated SPDX License Expression reference from 2.0 to 2.1 (ehuss#8).
* Document our license-list version, parens issue, and license (ehuss#16,
  ehuss#17).
* Add Travis CI configuration (ehuss#22).
* Add additional test cases (ehuss#25).
* .mailmap: Consolidate authors (ehuss#26).
@wking wking mentioned this pull request Jun 18, 2018
wking added a commit to wking/license-exprs that referenced this pull request Jun 18, 2018
Changes since v1.3.0:

* Updated SPDX License List to 3.1 (ehuss#9, ehuss#11, ehuss#17, ehuss#19, ehuss#24).
* Updated SPDX License Expression reference from 2.0 to 2.1 (ehuss#8).
* Document our license-list version, parens issue, and license (ehuss#16,
  ehuss#17).
* Add Travis CI configuration (ehuss#22).
* Add additional test cases (ehuss#25).
* .mailmap: Consolidate authors (ehuss#26).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant