Merge branch 'koszko' into jahoti

1 files changed, 46 insertions, 22 deletions

diff --git a/copyright b/copyright
index 0831655..243b4a1 100644
--- a/copyright
+++ b/copyright
@@ -1,12 +1,13 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Hachette
+Upstream-Name: Haketilo
 Source: https://git.koszko.org/browser-extension/
 
 Files: *
 Copyright: 2021 Wojtek Kosior <koszko@koszko.org>
 License: GPL-3+-javascript or Alicense-1.0
 
-Files: *.sh
+Files: *.sh default_settings.json Makefile.in compute_scripts.awk
+       CHROMIUM_exports_init.js
 Copyright: 2021 Wojtek Kosior <koszko@koszko.org>
    2021 jahoti <jahoti@tilde.team>
 License: CC0
@@ -20,15 +21,31 @@ Copyright: 2021 Wojtek Kosior <koszko@koszko.org>
    2021 jahoti <jahoti@tilde.team>
 License: GPL-3+-javascript or Alicense-1.0
 
+Files: background/stream_filter.js
+Copyright: 2018 Giorgio Maone <giorgio@maone.net>
+   2021 Wojtek Kosior <koszko@koszko.org>
+License: GPL-3+-javascript or Alicense-1.0, and GPL-3+
+Comment: Code by Wojtek is dual-licensed under GPL-3+-javascript and
+ Alicense-1.0. Giorgio's code is under GPL-3+.
+
 Files: *.html README.txt copyright
 Copyright: 2021 Wojtek Kosior <koszko@koszko.org>
 License: GPL-3+ or Alicense-1.0 or CC-BY-SA-4.0
 
+Files: html/*.css
+Copyright: 2021 Wojtek Kosior <koszko@koszko.org>
+License: GPL-3+ or Alicense-1.0 or CC-BY-SA-4.0
+
 Files: html/base.css
 Copyright: 2021 Wojtek Kosior <koszko@koszko.org>
    2021 Nicholas Johnson <nicholasjohnson@posteo.org>
 License: GPL-3+ or Alicense-1.0 or CC-BY-SA-4.0
 
+Files: html/reset.css
+Copyright: 2008,2011 Eric A. Meyer
+License: public-domain
+ This stylesheet has been place in public domain by its author.
+
 Files: common/sha256.js
 Copyright: 2014-2017 Chen, Yi-Cyuan <emn178@gmail.com>
 License: Expat
@@ -51,18 +68,28 @@ License: Expat
  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-Files: content/freezer.js
-Copyright: 2005-2021 Giorgio Maone - https://maone.net
-   2021 jahoti <jahoti@tilde.team>
-License: GPL-2+
-
 Files: test/*
 Copyright: 2021 jahoti <jahoti@tilde.team>
+   2021 Wojtek Kosior <koszko@koszko.org>
 License: AGPL-3+
+Comment: Wojtek Kosior promises not to sue even in case of violations
+ of the license.
+
+Files: test/__init__.py test/unit/*
+       test/default_profiles/icecat_empty/extensions.json
+Copyright: 2021 Wojtek Kosior <koszko@koszko.org>
+License: CC0
+
+Files: test/profiles.py test/script_loader.py test/unit/conftest.py
+Copyright: 2021 Wojtek Kosior <koszko@koszko.org>
+License: GPL-3+
+Comment: Wojtek Kosior promises not to sue even in case of violations
+ of the license.
 
-Files: test/proxy_core.py test/init.sh
+Files: test/proxy_core.py
 Copyright: 2015, inaz2
    2021 jahoti <jahoti@tilde.team>
+   2021 Wojtek Kosior <koszko@koszko.org>
 License: BSD-3
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
@@ -74,9 +101,9 @@ License: BSD-3
    this list of conditions and the following disclaimer in the documentation
    and/or other materials provided with the distribution.
  .
- * Neither the name of proxy2 nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
+ * Neither the name of proxy2 nor the names of its contributors may be used to
+   endorse or promote products derived from this software without specific prior
+   written permission.
  .
  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -88,11 +115,8 @@ License: BSD-3
  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Files: test/gorilla.py test/misc_constants.py test/world_wide_library.py test/data/pages/*
-Copyright: 2021 jahoti <jahoti@tilde.team>
-   2021 jahoti <jahoti@tilde.team>
-License: AGPL-3+ or Alicense-1.0
+Comment: Wojtek Kosior promises not to sue even in case of violations
+ of the license.
 
 Files: licenses/*
 Copyright: 2001, 2002, 2011-2013 Creative Commons
@@ -167,12 +191,6 @@ License: GPL-2+
  along with this program; if not, write to the Free Software
  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-License: CC-BY-SA-4.0
- See `licenses/cc-by-sa-4.0.txt'
-
-License: CC-BY-4.0
- See `licenses/cc-by-4.0.txt'
-
 License: AGPL-3+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU Affero General Public License as
@@ -187,3 +205,9 @@ License: AGPL-3+
  You should have received a copy of the
  GNU Affero General Public License along with this program; if not,
  you can get it from  `https://www.gnu.org/licenses/agpl-3.0.html'.
+
+License: CC-BY-SA-4.0
+ See `licenses/cc-by-sa-4.0.txt'
+
+License: CC-BY-4.0
+ See `licenses/cc-by-4.0.txt'