X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=debian%2Fcopyright;h=00a73b0806c9853afc1f17690b89aff0063a10d8;hb=b96bbd5a8d4395d91421599c58b9a2f63173db2f;hp=4e584e0fe7c18ba41623b250593e78105b3f7e00;hpb=307d9bf70dec6e98cf0403b95ead326611ad2f37;p=privoxy.git

diff --git a/debian/copyright b/debian/copyright
index 4e584e0f..00a73b08 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,29 +1,49 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Privoxy
 Upstream-Contact: Privoxy Developers <privoxy-devel@lists.privoxy.org>
-Source: http://www.privoxy.org/sf-download-mirror/Sources/
+Source: https://sourceforge.net/projects/ijbswa/files/Sources/
 
 Files: *
 Copyright:
- Copyright (C) 2001-2016 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-2016 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
- utils/create-package-feed.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-2016 Fabian Keil <fk@fabiankeil.de>
+ Copyright (c) 2006-2021 Fabian Keil <fk@fabiankeil.de>
 License: ISC
 
-Files: strptime.h
+Files: ./strptime.h
 Copyright:
  Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 Comment:
@@ -31,14 +51,19 @@ Comment:
  Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 License: GPL-2+
 
+Files: ./config.guess ./config.sub
+Copyright:
+  1992-2013, Free Software Foundation, Inc.
+License: GPL-2+
+
 Files: debian/*
 Copyright:
- 2002-2016  Roland Rosenfeld <roland@debian.org>
+ 2002-2021  Roland Rosenfeld <roland@debian.org>
 License: GPL-2+
 
-Files: pcre/*
+Files: ./pcre/*
 Copyright: Copyright (c) 1997-2000 University of Cambridge
-Comment: 
+Comment:
  Written by: Philip Hazel <ph10@cam.ac.uk>
  .
  University of Cambridge Computing Service,
@@ -54,7 +79,7 @@ License: BSD-like
  .
  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.
  .