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

Adding License #989

Merged
merged 11 commits into from Dec 23, 2016
Merged

Adding License #989

merged 11 commits into from Dec 23, 2016

Conversation

p0o
Copy link
Contributor

@p0o p0o commented Jul 15, 2016

Based on the issue created at #987
In the Readme the license was mentioned as GPL v2 or later so I added the latest one which is GPL v3.

@philiparthurmoore
Copy link
Collaborator

Can't do that. Needs to be GPL2 or later. Look at Core's license file.

@philiparthurmoore
Copy link
Collaborator

Just looked at the code changes. Don't change the license! That's a problem. Just submit a PR with a proper license file and reference license.txt in the stylesheet. 😄

(Not suggesting this will be merged but it definitely needs serious consideration. I'd be in favor.)

@p0o
Copy link
Contributor Author

p0o commented Jul 15, 2016

Is v2.1 okay?

I also didn't get what you mean by changing license? It's the default LICENSE template from github and I just added the link to the file in readme and contributing texts. You mean Readme and Contributing shouldn't change?

@philiparthurmoore
Copy link
Collaborator

GPL3 and "GPL2 or later" have completely different implications. Let me find a decent license file. One sec.

@philiparthurmoore
Copy link
Collaborator

@p0o
Copy link
Contributor Author

p0o commented Jul 15, 2016

That's fine then it's v.2.0 not later. I will fix the PR now.

@philiparthurmoore
Copy link
Collaborator

No, it means that someone can develop either a GPL2 or GPL3 product when the license is "GPL2 or later". It doesn't mean that you cannot make a GPL3 product when the license is explicitly GPL2 or later.

@philiparthurmoore
Copy link
Collaborator

The only thing you need to be submitting is a license file and potentially a change to the license URL in style.css. You don't need to touch contributing or readme files at all.

@jrfnl
Copy link
Contributor

jrfnl commented Jul 15, 2016

Let me find a decent license file

Pro-tip (not so much for here, but in general):
If you create new file from the GH web interface and call it License, GH will bring up a drop down select box to let you select the license you want and fills the text area with the appropriate license text. Click on Save and you're done. 😎

@philiparthurmoore
Copy link
Collaborator

Filing that in my pro-tip box. Nice.

@@ -15,7 +15,7 @@ My ultra-minimal CSS might make me look like theme tartare but that means less s
* A script at `js/navigation.js` that makes your menu a toggled dropdown on small screens (like your phone), ready for CSS artistry. It's enqueued in `functions.php`.
* 2 sample CSS layouts in `layouts/` for a sidebar on either side of your content.
* Smartly organized starter CSS in `style.css` that will help you to quickly get your design off the ground.
* Licensed under GPLv2 or later. :) Use it to make something cool.
* Licensed under [GPLv2](LICENSE) . :) Use it to make something cool.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is wrong. Put it back to the way it was.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The language "GPLv2 or later" is very important. It can't change.

@p0o
Copy link
Contributor Author

p0o commented Jul 15, 2016

@jrfnl Yes that's actually what I did.

@philiparthurmoore Okay give me a minute.

@philiparthurmoore
Copy link
Collaborator

This is about 8 commits deep. It should be 1 with 1) an additional license file and 2) possibly a few adjustments to style.css and other files.

It needs to be cleaned up. Let's try to get a clean PR in and figure out what a consensus is around including it. All these commits are making me jittery. Thanks for your persistence. :-)

@p0o
Copy link
Contributor Author

p0o commented Jul 15, 2016

@philiparthurmoore lol I always regret it when I use github UI instead of cli. It doesn't have revert let me clone and revert back.

@philiparthurmoore
Copy link
Collaborator

It's all good. We can squash in GitHub. I'm just getting jittery. ;-)

You need to change license URL here: https://github.com/Automattic/_s/blob/master/style.css

@p0o
Copy link
Contributor Author

p0o commented Jul 15, 2016

@philiparthurmoore change that to the local file? I'm not sure like this you mean?
License URI: /LICENSE

@philiparthurmoore
Copy link
Collaborator

LICENSE is fine. No slash needed.

@philiparthurmoore
Copy link
Collaborator

Thanks. It's probably worth letting this marinate for a bit so other people can get some eyes on it.

11 PM in Vietnam on Friday. Happy Weekend time.

You're a champ for all these adjustments.

@p0o
Copy link
Contributor Author

p0o commented Jul 15, 2016

Haha thanks and sorry for inconvenience. Happy weekend time from Malaysia!

By the way if you know a way to remove those commits let me know. It's kinda annoying.

@philiparthurmoore
Copy link
Collaborator

Easy. We can squash them into one pre-merge. :-)

Enjoy your evening!

@josephfusco
Copy link
Contributor

We need a change in readme.txt as well for this PR.

https://github.com/Automattic/_s/blob/master/readme.txt#L10

@josephfusco
Copy link
Contributor

While we are at it can we make these consistent?

GPLv2 or later
https://github.com/Automattic/_s/blob/master/readme.txt#L9

vs

GNU General Public License v2 or later
https://github.com/Automattic/_s/blob/master/style.css#L8

@joshmcrty
Copy link
Contributor

+1 for these changes

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.

None yet

6 participants