X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=debian%2Fcopyright;h=d68b465db9a02ccd24e994a3b95369b6fade54ae;hp=9c41e3fc582e303b522b261f44bf123e0ba04d12;hb=a247b5978740016349cbcb33ae81e46eebf4ea0a;hpb=3065d0a638aecf62a662d2f21eb6583c46d28d61

diff --git a/debian/copyright b/debian/copyright
index 9c41e3fc..d68b465d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,22 +5,42 @@ Source: https://sourceforge.net/projects/ijbswa/files/Sources/
 
 Files: *
 Copyright:
- Copyright (C) 2001-2018 by the Privoxy team. http://www.privoxy.org/
+ Copyright (C) 2001-2021 by the Privoxy team. https://www.privoxy.org/
+ Copyright (C) 2001-2021 by Privoxy Developers <privoxy-devel@lists.privoxy.org>
+ Parts Copyright (c) 1997 by Anonymous Coders and Junkbusters, Inc.
  Parts Copyright (C) 1999 Adam Lock <locka@iol.ie>
+ Parts Copyright (C) 1998-1999 Steve Cheng <steve@ggi-project.org>
+ Parts Copyright (C) 2000-2002 Greg Ferguson <gferg@metalab.unc.edu>
+ Parts Copyright (C) 2001 Jonathan Foster http://www.jon-foster.co.uk/
  Parts Copyright (C) 2003 Ian Cummings <ian_a_c@hotmail.com>
- Parts Copyright (C) 2000, 2001 by Andreas S. Oesterhelt <andreas@oesterhelt.org>
- Parts Copyright (C) 2006-2018 Fabian Keil <fk@fabiankeil.de>
+ Parts Copyright (C) 2000-2003 by Andreas S. Oesterhelt <andreas@oesterhelt.org>
+ Parts Copyright (C) 2006-2021 Fabian Keil <fk@fabiankeil.de>
+ Parts Copyright (c) 2020 Maxim Antonov <mantonov@gmail.com>
+ Parts Copyright (C) 2017-2020 Vaclav Svec. FIT CVUT.
 Comment:
- Based on the Internet Junkbuster originally written
- by and Copyright (C) 1997 Anonymous Coders and
- Junkbusters Corporation.  http://www.junkbusters.com
+ Some source code is based on code Copyright (c) 1997 by Anonymous
+ Coders and Junkbusters, Inc. and licensed under the GNU General
+ Public License.
+ .
+ Privoxy is free software; you can redistribute and/or modify its
+ source code under the terms of the GNU General Public License as
+ published by the Free Software Foundation, either version 2 of the
+ license, or (at your option) any later version.
+ .
+ The same is true for Privoxy binaries unless they are linked with a
+ mbed TLS version that is licensed under the Apache 2.0 license in
+ which case you can redistribute and/or modify the Privoxy binaries
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation, either version 3 of the license, or (at
+ your option) any later version.
 License: GPL-2+
 
-Files: ./regression-tests.action ./tools/uagen.pl ./tools/privoxy-regression-test.pl
- ./tools/privoxy-log-parser.pl ./tools/url-pattern-translator.pl ./utils/changelog2doc.pl
+Files: ./regression-tests.action ./tools/uagen.pl
+ ./tools/privoxy-regression-test.pl ./tools/privoxy-log-parser.pl
+ ./tools/url-pattern-translator.pl ./utils/changelog2doc.pl
  ./utils/create-package-feed.pl
 Copyright:
- Copyright (c) 2006-2017 Fabian Keil <fk@fabiankeil.de>
+ Copyright (c) 2006-2021 Fabian Keil <fk@fabiankeil.de>
 License: ISC
 
 Files: ./strptime.h
@@ -31,36 +51,15 @@ Comment:
  Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 License: GPL-2+
 
-Files: debian/*
+Files: ./config.guess ./config.sub
 Copyright:
- 2002-2018  Roland Rosenfeld <roland@debian.org>
+  1992-2013, Free Software Foundation, Inc.
 License: GPL-2+
 
-Files: ./pcre/*
-Copyright: Copyright (c) 1997-2000 University of Cambridge
-Comment:
- Written by: Philip Hazel <ph10@cam.ac.uk>
- .
- University of Cambridge Computing Service,
- Cambridge, England. Phone: +44 1223 334714.
-License: BSD-like
- Permission is granted to anyone to use this software for any purpose on any
- computer system, and to redistribute it freely, subject to the following
- restrictions:
- .
- 1. This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- .
- 2. The origin of this software must not be misrepresented, either by
-    explicit claim or by omission.
- .
- 3. Altered versions must be plainly marked as such, and must not be
-    misrepresented as being the original software.
- .
- 4. If PCRE is embedded in any software that is released under the GNU
-    General Purpose Licence (GPL), then the terms of that licence shall
-    supersede any condition above with which it is incompatible.
+Files: debian/*
+Copyright:
+ 2002-2021  Roland Rosenfeld <roland@debian.org>
+License: GPL-2+
 
 License: GPL-2+
  This program is free software; you can redistribute it