Updated copyright.

diff --git a/debian/copyright b/debian/copyright
index 85a15978f13a4ec31b79f94e6c63b06f4722bb8b..30331f2965709d75f3be6624e68ef03289f54395 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -283,11 +283,6 @@ Licenses:
        Copyright © 2009 Rodolphe Quiédeville <rquiedeville@bearstech.com>
        License: GNU General Public License
 
-       File src/network.c
-       Copyright © 2005-2009 Florian Forster <octo@verplant.org>
-       Copyright © 2009 Aman Gupta <aman@tmm1.net>
-       License: GNU General Public License
-
        File src/nfs.c
        Copyright © 2005, 2006 Jason Pepas <cell@ices.utexas.edu>
        License: GNU General Public License
@@ -402,7 +397,7 @@ Licenses:
        Copyright © 2009 Doug MacEachern <dougm@hyperic.com>
        License: GNU General Public License
 
-       All other files (except libltdl/*, src/utils_dns.* and
+       All other files (except libltdl/*, src/network.c, src/utils_dns.* and
                contrib/SpamAssassin/*):
        Copyright © 2005-2009 Florian Forster <octo@verplant.org>
        License: GNU General Public License
@@ -450,16 +445,15 @@ text of the latest version can be found in `/usr/share/common-licenses/GPL'.
           misrepresented as being the original software.
        3. This notice may not be removed or altered from any source distribution.
 
-       File libltdl/ltdl.c
-       Copyright © 1998-2001, 2003-2007 Free Software Foundation, Inc.
-       Originally by Thomas Tanner <tanner@ffii.org>
+       Files libltdl/* (except libltdl/m4/*)
+       Copyright © 1998-2008 Free Software Foundation, Inc.
        License: GNU Lesser General Public License
 
-       File libltdl/ltdl.h
-       Copyright © 1998-2000 Free Software Foundation, Inc.
-       Originally by Thomas Tanner <tanner@ffii.org>
+       File src/network.c
+       Copyright © 2005-2009 Florian Forster <octo@verplant.org>
+       Copyright © 2009 Aman Gupta <aman@tmm1.net>
        License: GNU Lesser General Public License
-       
+
        This library is free software; you can redistribute it and/or
        modify it under the terms of the GNU Lesser General Public
        License as published by the Free Software Foundation; either
@@ -478,6 +472,13 @@ text of the latest version can be found in `/usr/share/common-licenses/GPL'.
 On Debian systems, the complete text of the GNU Lesser General Public License
 can be found in `/usr/share/common-licenses/LGPL'.
 
+       Files libltdl/m4/*
+       Copyright © 1996-2008 Free Software Foundation, Inc.
+
+       This file is free software; the Free Software Foundation gives
+       unlimited permission to copy and/or distribute it, with or without
+       modifications, as long as this notice is preserved.
+
        Parts of the file src/tcpconns.c
        Copyright © 1983, 1988, 1993 The Regents of the University of California
        License: BSD License