Import Debian changes 4.92-8+deb10u4

[hcoop/debian/exim4.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 453276d..b986c5e 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -55,17 +55,17 @@ important feedback:
 
 
 -----------------------------------------------------------------
-exim is copyright (c) 1999 University of Cambridge.
+exim is copyright (c) 1995 - 2018 University of Cambridge.
 
 The original licence is as follows (from the file NOTICE in the upstream
-distribution); a copy of the GNU GPL version 2 is available in 
+distribution); a copy of the GNU GPL version 2 is available in
 /usr/share/common-licenses/GPL-2 on Debian systems.
 
 _________________________________________________________________________
 THE EXIM MAIL TRANSFER AGENT
 ----------------------------
 
-Copyright (c) 2002 University of Cambridge
+Copyright (c) 2004 University of Cambridge
 
 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
@@ -83,7 +83,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
 UNSOLICITED EMAIL
@@ -101,14 +101,6 @@ INCORPORATED CODE
 
 A number of pieces of external code are included in the Exim distribution.
 
- .   Regular expressions are supported in the main Exim program and in the
-     Exim monitor using the freely-distributable PCRE library, copyright (c)
-     2003 University of Cambridge. The source is distributed in the directory
-     src/pcre. However, this is a cut-down version of PCRE. If you want to use
-     the PCRE library in other programs, you should obtain and install the
-     full version from ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre.
-
-
  .   Support for the cdb (Constant DataBase) lookup method is provided by code
      contributed by Nigel Metheringham of Planet Online Ltd. which contains
      the following statements:
@@ -222,11 +214,6 @@ A number of pieces of external code are included in the Exim distribution.
 
 --
 Philip Hazel            University of Cambridge Computing Service,
-ph10@cus.cam.ac.uk      Cambridge, England. Phone: +44 1223 334714.
------------------------------------------------------------------
-
-
-
 -----------------------------------------------------------------
 src/pdkim/*
 
@@ -234,29 +221,9 @@ PDKIM - a RFC4871 (DKIM) implementation
 http://duncanthrax.net/pdkim/
 Copyright (C) 2009      Tom Kistner <tom@duncanthrax.net>
 
-Includes code from the PolarSSL project.
-http://polarssl.org
-Copyright (C) 2009      Paul Bakker <polarssl_maintainer@polarssl.org>
-Copyright (C) 2006-2008 Christophe Devine
+No longer includes code from the PolarSSL project.
+Copyright (C) 2016 Jeremy Harris <jgh@exim.org>
 
 This copy of PDKIM is included with Exim. For a standalone distribution,
 visit http://duncanthrax.net/pdkim/.
-
-License: Both the parts from PolarSSL and the original code are licensed
-under GPLv2+.
------------------------------------------------------------------
-
 -----------------------------------------------------------------
-Generating a tarball from CVS snapshot.
-
-Upstream is keeping sourcecode and documention (including changelog) in
-separate CVS modules: exim-src and exim-doc. However the release tarball
-contains parts from both modules.
-
-1. Use exim-src modules as base
-2. Generate a doc subdirectory containing he contents of exim-doc/doc-txt/.
-3. Take exim-doc and build the txt files You will need xfpt, xmlto, docbook-xsl
-and w3m.
-cd doc-docbook ; make spec.txt filter.txt exim.8
-Copy the three files to exim-version/doc/
-