copyright: Updated for 4.10.0.

diff --git a/debian/copyright b/debian/copyright
index ed42f9db4c003644874753f73d6901cd25af6d23..507244a391eb92d3b15eb695217635ce995c1ba9 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -23,11 +23,13 @@ Copyright Holders (in alphabetical order):
        Bruno Prémont <bonbons@linux-vserver.org>
        C-Ware, Inc.
        Clay Loveless <clay@killersoft.com>
+       Clément Stenac <clement.stenac@diwi.org>
        David Bacher <drbacher@gmail.com>
        Doug MacEachern <dougm@hyperic.com>
        Edward Konetzko <konetzed@quixoticagony.com>
        Eric Reed <ericr@reedhome.net>
        Eric Spreen <erispre@gmail.com>
+       Fabian Schuh <mail@xeroc.org>
        Flavio Stanchina <flavio@stanchina.net>
        Florent Monbillard <eppo@darox.net>
        Florent Usseil <swiip81@free.fr>
@@ -65,6 +67,7 @@ Copyright Holders (in alphabetical order):
        Pavel Shramov <shramov@mexmat.net>
        Peter Holik <peter@holik.at>
        Peter Kese <peter.kese@ijs.si>
+       Phoenix Kayo <kayo.k11.4@gmail.com>
        Red Hat Inc.
        Rodolphe Quiédeville <rquiedeville@bearstech.com>
        Scott Garrett <sgarrett@technomancer.com>
@@ -176,7 +179,6 @@ Licenses:
              src/logfile.c
              src/match_regex.c
              src/nginx.c
-             src/postgresql.c
              src/scanner.l
              src/utils_cmd_flush.c
              src/utils_complain.c
@@ -216,6 +218,10 @@ Licenses:
        Copyright © 2009 Aman Gupta <aman@tmm1.net>
        License: GNU General Public License
 
+       File src/curl_xml.c
+       Copyright © 2009-2010 Amit Gupta <amit.gupta221@gmail.com>
+       License: GNU General Public License
+
        Files src/csv.c
              src/curl_json.c
        Copyright © 2006-2009 Florian Forster <octo@verplant.org>
@@ -240,7 +246,7 @@ Licenses:
        License: GNU General Public License
 
        File src/exec.c
-       Copyright © 2007-2008 Florian Forster <octo@verplant.org>
+       Copyright © 2007-2010 Florian Forster <octo@verplant.org>
        Copyright © 2007-2009 Sebastian Harl <sh@tokkee.org>
        Copyright © 2008 Peter Holik <peter@holik.at>
        License: GNU General Public License
@@ -299,7 +305,6 @@ Licenses:
        License: GNU General Public License
 
        Files src/memcachec.c
-             src/openvpn.c
        Copyright © 2008-2009 Doug MacEachern <dougm@hyperic.com>
        Copyright © 2006-2009 Florian Forster <octo@verplant.org>
        Copyright © 2009 Marco Chiappero <marco@absence.it>
@@ -318,6 +323,11 @@ Licenses:
        Copyright © 2009 Manuel Sanmartin
        License: GNU General Public License
 
+       File src/modbus.c
+       Copyright © 2010 noris network AG
+       Author: Florian Forster <octo@noris.net>
+       License: GNU General Public License
+
        File src/mysql.c
        Copyright © 2006-2009 Florian Forster <octo@verplant.org>
        Copyright © 2008 Mirko Buffoni <briareos@eswat.org>
@@ -334,10 +344,23 @@ Licenses:
        Copyright © 2008 Oleg King <king2@kaluga.ru>
        License: GNU General Public License
 
+       File src/openvpn.c
+       Copyright © 2008-2009 Doug MacEachern <dougm@hyperic.com>
+       Copyright © 2006-2009 Florian Forster <octo@verplant.org>
+       Copyright © 2009 Marco Chiappero <marco@absence.it>
+       Copyright © 2009 Fabian Schuh <mail@xeroc.org>
+       License: GNU General Public License
+
        Files src/owniptc/*
        Copyright © 1999-2008 Netfilter Core Team
        License: GNU General Public License
 
+       File src/pinba.c
+       Copyright © 2007-2009 Antony Dovgal <tony@daylessday.org>
+       Copyright © 2010 Phoenix Kayo <kayo.k11.4@gmail.com>
+       Copyright © 2010 Florian Forster <octo@verplant.org>
+       License: GNU General Public License
+
        Files src/powerdns.c
              src/utils_tail.c
              src/utils_tail_match.c
@@ -353,6 +376,7 @@ Licenses:
        Copyright © 2009 Sebastian Harl <sh@tokkee.org>
        Copyright © 2009 Andrés J. Díaz <ajdiaz@connectical.com>
        Copyright © 2009 Manuel Sanmartin
+       Copyright © 2010 Clément Stenac <clement.stenac@diwi.org>
        License: GNU General Public License
 
        File src/rrdtool.c
@@ -443,9 +467,9 @@ Licenses:
        Copyright © 2009 Doug MacEachern <dougm@hyperic.com>
        License: GNU General Public License
 
-       All other files (except libltdl/*, src/network.c, src/utils_dns.* and
-               contrib/SpamAssassin/*):
-       Copyright © 2005-2009 Florian Forster <octo@verplant.org>
+       All other files (except libltdl/*, src/network.c, src/postgresql.c,
+               src/utils_dns.* and contrib/SpamAssassin/*):
+       Copyright © 2005-2010 Florian Forster <octo@verplant.org>
        License: GNU General Public License
 
        This package is free software; you can redistribute it and/or modify
@@ -567,6 +591,36 @@ can be found in `/usr/share/common-licenses/LGPL'.
        ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
        POSSIBILITY OF SUCH DAMAGE.
 
+       File src/postgresql.c
+       Copyright © 2008-2009 Sebastian Harl <sh@tokkee.org>
+       Copyright © 2009 Florian Forster <octo@verplant.org>
+       License: 2-clause BSD License
+
+       All rights reserved.
+
+       Redistribution and use in source and binary forms, with or without
+       modification, are permitted provided that the following conditions
+       are met:
+
+       - Redistributions of source code must retain the above copyright
+         notice, this list of conditions and the following disclaimer.
+
+       - Redistributions in binary form must reproduce the above copyright
+         notice, this list of conditions and the following disclaimer in the
+         documentation and/or other materials provided with the distribution.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+       AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+       IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+       ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+       LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+       INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+       CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+       ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+       POSSIBILITY OF SUCH DAMAGE.
+
        Files src/cpython.h
              src/netapp.c
              src/pyconfig.c