Adding License #989

Merged
merged 11 commits into from Dec 23, 2016

Projects

None yet

6 participants

@p0o
Contributor
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
Collaborator

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

@philiparthurmoore
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
Contributor
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
Collaborator

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

@p0o
Contributor
p0o commented Jul 15, 2016

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

@philiparthurmoore
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
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
Contributor
jrfnl commented Jul 15, 2016 edited

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
Collaborator

Filing that in my pro-tip box. Nice.

@philiparthurmoore philiparthurmoore commented on an outdated diff Jul 15, 2016
@@ -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.
@philiparthurmoore
philiparthurmoore Jul 15, 2016 Collaborator

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

@philiparthurmoore
philiparthurmoore Jul 15, 2016 Collaborator

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

@p0o
Contributor
p0o commented Jul 15, 2016

@jrfnl Yes that's actually what I did.

@philiparthurmoore Okay give me a minute.

@philiparthurmoore
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
Contributor
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
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
Contributor
p0o commented Jul 15, 2016

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

@philiparthurmoore
Collaborator

LICENSE is fine. No slash needed.

@philiparthurmoore
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
Contributor
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
Collaborator

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

Enjoy your evening!

@josephfusco
Contributor

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

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

@josephfusco
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
Contributor

+1 for these changes

@karmatosed karmatosed merged commit 44710f2 into Automattic:master Dec 23, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment