From 062be2d4a5fc0ef79f500a80fe8f498a14c6e760 Mon Sep 17 00:00:00 2001 From: Cassandra Watergate <55339220+saltedcoffii@users.noreply.github.com> Date: Thu, 9 Jun 2022 15:23:00 -0700 Subject: [PATCH] Fix up licenses (#7128) * fix up license, clairify docopt license, clear up attribution, and add pictures to README * use year range from README in LICENSESTRING * fix up images --- README.md | 5 +++++ bin/crew | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 53648b4f6..b01ce7ba2 100644 --- a/README.md +++ b/README.md @@ -154,3 +154,8 @@ License Copyright 2013-2022 Michal Siwek and [all the awesome contributors](https://github.com/skycocker/chromebrew/graphs/contributors). This project including all of its source files is released under the terms of [GNU General Public License (version 3 or later)](http://www.gnu.org/licenses/gpl.txt). + +This project embeds [docopt.rb](https://github.com/docopt/docopt.rb) at lib/docopt.rb. We retain its [MIT license](https://github.com/skycocker/chromebrew/blob/master/lib/docopt.LICENSE). + +GNU General Public License +MIT License diff --git a/bin/crew b/bin/crew index 80baeb722..4f57a67db 100755 --- a/bin/crew +++ b/bin/crew @@ -56,11 +56,12 @@ version #{CREW_VERSION} DOCOPT CREW_LICENSE = <<~LICENSESTRING - Copyright (C) 2021 Chromebrew Authors + Copyright (C) 2013-2022 Chromebrew Authors This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, version 3 of the License. + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -69,6 +70,10 @@ CREW_LICENSE = <<~LICENSESTRING You should have received a copy of the GNU General Public License along with this program. If not, see https://www.gnu.org/licenses/gpl-3.0.html. + + Chromebrew embeds lib/docopt.rb from another project under the MIT License. + You should have received a copy of the license along with this program. + If not, see https://github.com/docopt/docopt.rb/blob/master/LICENSE LICENSESTRING # All available crew commands.