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

chore: Dual license between Unlicense and MIT #4870

Closed
wants to merge 26 commits into from
Closed
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
2282f27
Rename LICENSE to LICENSE.PD
rickbot-dot Apr 13, 2022
dd2a0cc
Create LICENSE.MIT
rickbot-dot Apr 13, 2022
a91f6bd
Merge branch 'develop' into dual-license
rickbot-dot Apr 14, 2022
1a95ae7
Update CHANGELOG.md
rickbot-dot Apr 14, 2022
061e9bf
Merge branch 'develop' into dual-license
rickbot-dot Apr 14, 2022
ede15ad
Merge branch 'develop' into dual-license
rickbot-dot Apr 16, 2022
b4406e3
Rename LICENSE.PD to UNLICENSE
rickbot-dot Apr 17, 2022
4e4cd31
Rename LICENSE.MIT to MIT-LICENSE
rickbot-dot Apr 17, 2022
f6b206f
Update CHANGELOG.md
rickbot-dot Apr 17, 2022
5ddd198
Update CHANGELOG.md
rickbot-dot Apr 17, 2022
320a28f
Delete MIT-LICENSE
rickbot-dot Apr 19, 2022
0cf4c73
Update and rename UNLICENSE to LICENSE
rickbot-dot Apr 19, 2022
39b1f4b
Update LICENSE
rickbot-dot Apr 19, 2022
5f14f9f
Update LICENSE
rickbot-dot Apr 19, 2022
2fa53dd
Update LICENSE
rickbot-dot Apr 19, 2022
e086922
Update LICENSE
rickbot-dot Apr 19, 2022
821eada
add link to contributors, remove copyright end year
rickbot-dot Apr 19, 2022
e45f0b3
Update LICENSE
rickbot-dot Apr 20, 2022
783b0d4
Update LICENSE
rickbot-dot Apr 20, 2022
9f3c169
Merge branch 'develop' into dual-license
rickbot-dot Apr 20, 2022
5ec4cb8
Update LICENSE
rickbot-dot Apr 22, 2022
8d926ed
Update LICENSE
rickbot-dot Apr 22, 2022
2165471
Merge branch 'develop' into dual-license
rickbot-dot Apr 23, 2022
617154e
dropped copyright year just like .NET
rickbot-dot Apr 26, 2022
3b610b4
Update LICENSE
rickbot-dot Apr 26, 2022
3dc67eb
Update LICENSE
rickbot-dot Apr 26, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

### Features

- **relicense:** Dual-license between MIT license and Unlicense ([#4870](https://github.com/ScoopInstaller/Scoop/issues/4870))
- **install:** Allow downloading from private repositories ([#4254](https://github.com/ScoopInstaller/Scoop/issues/4243))

### Bug Fixes
Expand Down
53 changes: 53 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
INFORMATION ABOUT THIS PROJECT'S LICENSE (SHORT)
============================================================================================
This project is licensed under the Unlicense or the MIT license,
at your option.

INFORMATION ABOUT THIS PROJECT'S LICENSE (LONG)
============================================================================================
This project ("Scoop") is free software, licensed under the Unlicense or the
MIT license, at your option. Scoop was previously licensed under only the Unlicense,
but was dual-licensed later for several reasons.

For more info, go to one of the following URLs:
- https://github.com/ScoopInstaller/Scoop/pull/4870
- https://github.com/github/choosealicense.com/issues/805
- https://github.com/ScoopInstaller/Scoop/issues/4868

Scoop comes with ABSOLUTELY NO WARRANTY. Use it at your own risk. Scoop is provided
on an AS-IS BASIS and it's contributors disclaim all warranties.

You may use, modify, distribute, sell, copy, compile, sell, or merge Scoop
by any means.

Copies of both licenses can be found below.

THE LICENSE OF SCOOP
============================================================================================
Unlicense
---------
This is free and unencumbered software released into the public domain.

Anyone is free to copy, modify, publish, use, compile, sell, or
Expand All @@ -22,3 +50,28 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.

For more information, please refer to <http://unlicense.org/>

MIT license
-----------
The MIT License (MIT)

Copyright (c) 2013-2017 Luke Sampson (https://github.com/lukesampson)
Copyright (c) 2013-present Scoop contributors (https://github.com/ScoopInstaller/Scoop/graphs/contributors)
Tyler887 marked this conversation as resolved.
Show resolved Hide resolved

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.