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

Reuse common licenses in copyright statements #4000

Merged
merged 2 commits into from
Nov 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ vendor/bat-native-ledger/src/bat/ledger/internal/static_values.h @gdregalo
browser/net/ @iefremov

# Licensing of third-party components
common_licenses/ @fmarier
common/licenses/ @fmarier
components/brave_new_tab_ui/data/backgrounds.ts @fmarier
script/brave_license_helper.py @fmarier
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

Expand Down Expand Up @@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
along with this program. If not, see <https://www.gnu.org/licenses/>.

Also add information on how to contact you by electronic and paper mail.

Expand All @@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>.
<https://www.gnu.org/licenses/>.

The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
<https://www.gnu.org/licenses/why-not-lgpl.html>.
File renamed without changes.
202 changes: 0 additions & 202 deletions components/brave_prochlo/LICENSE

This file was deleted.

1 change: 1 addition & 0 deletions components/brave_prochlo/README.chromium
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Name: PROCHLO
URL: https://github.com/google/prochlo
License: Apache-2.0
License File: /brave/common/licenses/Apache-2.0
3 changes: 0 additions & 3 deletions components/brave_shields/third_party/abp-xfiles/LICENSE

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Name: ABP X Files
URL: https://github.com/gioxx/xfiles/blob/master/filtri.txt
License: CC-BY-NC-SA-4.0
License File: /brave/common/licenses/CC-BY-NC-SA-4.0
1 change: 1 addition & 0 deletions components/brave_shields/third_party/abpjf/README.chromium
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Name: ABP Japanese filters
URL: https://github.com/k2jp/abp-japanese-filters/blob/master/abpjf.txt
License: CC-BY-NC-SA-4.0
License File: /brave/common/licenses/CC-BY-NC-SA-4.0
Loading