X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=debian%2Fcopyright;h=d68b465db9a02ccd24e994a3b95369b6fade54ae;hb=a247b5978740016349cbcb33ae81e46eebf4ea0a;hp=c4d99ac50b1b08430361b4918220f4cfeb70bdad;hpb=b1f25d63e134f8efce6f4d3851940468ace1f2df;p=privoxy.git

diff --git a/debian/copyright b/debian/copyright
index c4d99ac5..d68b465d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,16 +1,67 @@
-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 team <ijbswa-developers@lists.sourceforge.net>
-Source: http://sourceforge.net/projects/ijbswa/files/Sources/
+Upstream-Contact: Privoxy Developers <privoxy-devel@lists.privoxy.org>
+Source: https://sourceforge.net/projects/ijbswa/files/Sources/
 
 Files: *
-Copyright: Written by and Copyright (C) 2001-2014 the Privoxy team.
-           http://www.privoxy.org/
-License: GPL-2
- Based on the Internet Junkbuster originally written
- by and Copyright (C) 1997 Anonymous Coders and
- Junkbusters Corporation.  http://www.junkbusters.com
+Copyright:
+ 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-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:
+ 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
+Copyright:
+ Copyright (c) 2006-2021 Fabian Keil <fk@fabiankeil.de>
+License: ISC
+
+Files: ./strptime.h
+Copyright:
+ Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+Comment:
+ This file is part of the GNU C Library.
+ 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-2021  Roland Rosenfeld <roland@debian.org>
+License: GPL-2+
+
+License: GPL-2+
  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
@@ -32,3 +83,16 @@ License: GPL-2
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
+
+License: ISC
+ Permission to use, copy, modify, and distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.