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

Fix LICENSE on GitHub #1712

Merged
merged 2 commits into from
Oct 12, 2016
Merged

Fix LICENSE on GitHub #1712

merged 2 commits into from
Oct 12, 2016

Conversation

dschuermann
Copy link
Contributor

GitHub displays "BSD-3-Clause" as K-9 Mail's license in the header above the file listing. This is because the repo contains the file "HTMLCLEANER_LICENSE". Adding a "LICENSE" file with Apache v2 should solve this issue.

@dschuermann dschuermann changed the title add LICENSE Fix LICENSE on GitHub Oct 12, 2016
@philipwhiuk
Copy link
Contributor

philipwhiuk commented Oct 12, 2016

Do we need NOTICE and LICENSE?

EDIT: Answering my own question

Per http://www.apache.org/dev/apply-license.html#license-file-name and http://www.apache.org/dev/licensing-howto.html#mod-notice

we need both, but what we have in NOTICE should be in LICENSE and we need a short NOTICE file which references the licenses we are using (like the HTMLCLEANER_LICENSE )

@dschuermann
Copy link
Contributor Author

@philipwhiuk Like this?


K-9 Mail
Copyright 2008-2016, K-9 Mail Developers
Copyright 2006-2016, The Android Open Source Project
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this should be 2005 per line 2 of the old NOTICE.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I took the years from the About screen, but you are right old NOTICE says 2005. Will change it.

@philipwhiuk
Copy link
Contributor

philipwhiuk commented Oct 12, 2016

Looks a lot better. Thanks for looking into this @dschuermann . Probably need @cketti to review this as project lead but it's almost there I think.

@cketti
Copy link
Member

cketti commented Oct 12, 2016

I don't think we need to include the HtmlCleaner license in the NOTICE file. The repository doesn't contain any HtmlCleaner code. And we do have attribution for the Open Source libraries the app depends on in the About dialog of the app.

@dschuermann
Copy link
Contributor Author

done

@cketti cketti merged commit 6eca92e into master Oct 12, 2016
@cketti cketti deleted the license branch October 12, 2016 14:35
@cketti
Copy link
Member

cketti commented Oct 12, 2016

Thanks

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.

3 participants