copyright: Updated for 4.7.

diff --git a/debian/copyright b/debian/copyright
index a945d1660cb5c765bfabc2da1a84a95203bc046a..2955acc6989f4c4e50fff0529f97efb88f2ac6a1 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,32 +10,42 @@ Upstream Authors:
        For individual credits, see AUTHORS.
 
 Copyright Holders (in alphabetical order):
+       Adrian Perez <aperez@igalia.com>
        Alessandro Iurlano <alessandro.iurlano@gmail.com>
        Alexander Wirt <formorer@formorer.de>
        Américo Monteiro
+       Amit Gupta <amit.gupta221@gmail.com>
        Andre M. Hedrick <andre@suse.com>
        Anthony Gialluca <tonyabg@charter.net>
        Antony Dovgal <tony@daylessday.org>
        Bruno Prémont <bonbons@linux-vserver.org>
        C-Ware, Inc.
+       Clay Loveless <clay@killersoft.com>
        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>
        Flavio Stanchina <flavio@stanchina.net>
        Florent Monbillard <eppo@darox.net>
        Florent Usseil <swiip81@free.fr>
        Florian Forster <octo@verplant.org>
+       Franck Lombardi
        Free Software Foundation, Inc.
        Jacobo Tarrio <jtarrio@debian.org>
        Jason Pepas <cell@ices.utexas.edu>
        Juan Jose Ciarlante <jjciarla@raiz.uncu.edu.ar>
        Julian Anastasov <ja@ssi.bg>
+       Justo Alonso Achaques <justo.alonso@gmail.com>
        Kai Wasserbäch <debian@carbon-project.org>
        Kern Sibbald
        Lubos Stanek <lubek@users.sourceforge.net>
        Lyonel Vincent <lyonel@ezix.org>
+       Marco Chiappero <marco@absence.it>
        Martin Bagge <brother@bsnet.se>
+       Michael Stapelberg <michael+git@stapelberg.de>
        Michał Mirosław <mirq-linux@rere.qmqm.pl>
+       Mirko Buffoni <briareos@eswat.org>
        Netfilter Core Team
        Niki W. Waibel <niki.waibel@newlogic.com>
        Oleg King <king2@kaluga.ru>
@@ -43,12 +53,15 @@ Copyright Holders (in alphabetical order):
        Peter Holik <peter@holik.at>
        Peter Kese <peter.kese@ijs.si>
        Red Hat Inc.
+       Rodolphe Quiédeville <rquiedeville@bearstech.com>
        Scott Garrett <sgarrett@technomancer.com>
        Sebastian Harl <sh@tokkee.org>
+       Simon Kuhnle <simon@blarzwurst.de>
        Sjoerd van der Berg <harekiet@users.sourceforge.net>
        Stefan Hacker <d0t@dbclan.de>
        Steven Clarke <steven@monmouth.demon.co.uk>
        The Regents of the University of California
+       Tomasz Pala <gotar@pld-linux.org>
        Vincent Stehlé <vincent.stehle@free.fr>
        Wensong Zhang <wensong@linuxvirtualserver.org>
        Wouter Gadeyne
@@ -66,17 +79,23 @@ Licenses:
              src/email.c
              src/notify_desktop.c
              src/perl.c
+             src/table.c
              src/types.db.pod
-             src/users.c
              src/utils_cmd_flush.h
              src/utils_subst.c
              src/utils_subst.h
-             src/vserver.c
        Copyright © 2006-2008 Sebastian Harl <sh@tokkee.org>
        License: GNU General Public License
 
-       Files contrib/collectd2html.pl
-             src/hddtemp.c
+       File contrib/collectd-network.py
+       Copyright © 2009 Adrian Perez <aperez@igalia.com>
+       License: GNU General Public License
+
+       File contrib/collectd-unixsock.py
+       Copyright © 2008 Clay Loveless <clay@killersoft.com>
+       License: GNU General Public License
+
+       File contrib/collectd2html.pl
        Copyright © 2006 Vincent Stehlé <vincent.stehle@free.fr>
        License: GNU General Public License
 
@@ -97,17 +116,23 @@ Licenses:
        License: GNU General Public License
 
        File src/apache.c
-       Copyright © 2006-2008 Florian Forster <octo@verplant.org>
+       Copyright © 2006-2009 Florian Forster <octo@verplant.org>
        Copyright © 2007 Florent Monbillard <eppo@darox.net>
+       Copyright © 2009 Amit Gupta <amit.gupta221@gmail.com>
        License: GNU General Public License
 
        File src/apcups.c
-       Copyright © 2007 Florian Forster <octo@verplant.org>
+       Copyright © 2006-2007 Florian Forster <octo@verplant.org>
        Copyright © 2006 Anthony Gialluca <tonyabg@charter.net>
        Copyright © 2000-2004 Kern Sibbald
        Copyright © 1996-99 Andre M. Hedrick <andre@suse.com>
        License: GNU General Public License
 
+       File src/battery.c
+       Copyright © 2006-2007 Florian Forster <octo@verplant.org>
+       Copyright © 2008 Michał Mirosław <mirq-linux@rere.qmqm.pl>
+       License: GNU General Public License
+
        File src/bind.c
        Copyright © 2009 Bruno Prémont <bonbons@linux-vserver.org>
        Copyright © 2009 Florian Forster <octo@verplant.org>
@@ -116,13 +141,26 @@ Licenses:
        Files src/collectd-perl.pod
              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
              src/utils_complain.h
+             src/vserver.c
        Copyright © 2006-2009 Florian Forster
-       Copyright © 2007-2009 Sebastian Harl
+       Copyright © 2006-2009 Sebastian Harl
+       License: GNU General Public License
+
+       File src/conntrack.c
+       Copyright © 2009 Tomasz Pala <gotar@pld-linux.org>
+       License: GNU General Public License
+
+       File src/cpu.c
+       Copyright © 2005-2009 Florian Forster <octo@verplant.org>
+       Copyright © 2008 Oleg King <king2@kaluga.ru>
+       Copyright © 2009 Simon Kuhnle <simon@blarzwurst.de>
+       License: GNU General Public License
 
        Files src/cpufreq.c
              src/irq.c
@@ -130,18 +168,42 @@ Licenses:
        Copyright © 2005-2007 Peter Holik <peter@holik.at>
        License: GNU General Public License
 
+       File src/csv.c
+       Copyright © 2007-2009 Florian Forster <octo@verplant.org>
+       Copyright © 2009 Doug MacEachern <dougm@hyperic.com>
+       License: GNU General Public License
+
+       File src/exec.c
+       Copyright © 2007-2008 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
+
        File src/filecount.c
        Copyright © 2008 Alessandro Iurlano <alessandro.iurlano@gmail.com>
        Copyright © 2008 Florian Forster <octo@verplant.org>
        License: GNU General Public License
 
+       File src/fscache.c
+       Copyright © 2009 Edward Konetzko <konetzed@quixoticagony.com>
+       License: GNU General Public License
+
+       File src/hddtemp.c
+       Copyright © 2005-2006 Vincent Stehlé <vincent.stehle@free.fr>
+       Copyright © 2006-2007 Florian Forster <octo@verplant.org>
+       Copyright © 2008 Sebastian Harl <sh@tokkee.org>
+       License: GNU General Public License
+
        File src/ipmi.c
-       Copyright © 2008 Florian Forster <octo@verplant.org>
+       Copyright © 2008-2009 Florian Forster <octo@verplant.org>
        Copyright © 2008 Peter Holik <peter@holik.at>
+       Copyright © 2009 Bruno Prémont <bonbons@linux-vserver.org>
        License: GNU General Public License
 
        File src/iptables.c
        Copyright © 2007 Sjoerd van der Berg <harekiet@users.sourceforge.net>
+       Copyright © 2007 Florian Forster <octo@verplant.org>
+       Copyright © 2009 Marco Chiappero <marco@absence.it>
        License: GNU General Public License
 
        File src/ipvs.c
@@ -151,6 +213,11 @@ Licenses:
        Copyright © 2007 Sebastian Harl <sh@tokkee.org>
        License: GNU General Public License
 
+       File src/java.c
+       Copyright © 2008 Justo Alonso Achaques <justo.alonso@gmail.com>
+       Copyright © 2009 Florian Forster <octo@verplant.org>
+       License: GNU General Public License
+
        Files src/libiptc/*
        Copyright © 1999-2008 Netfilter Core Team
        License: GNU General Public License
@@ -162,11 +229,33 @@ Licenses:
 
        File src/mbmon.c
        Copyright © 2006 Flavio Stanchina
+       Copyright © 2006-2007 Florian Forster <octo@verplant.org>
+       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>
        License: GNU General Public License
 
        File src/memcached.c
-       Copyright © 2005,2006 Vincent Stehlé
        Copyright © 2007 Antony Dovgal
+       Copyright © 2007-2009 Florian Forster <octo@verplant.org>
+       Copyright © 2009 Doug MacEachern <dougm@hyperic.com>
+       Copyright © Franck Lombardi
+       License: GNU General Public License
+
+       File src/memory.c
+       Copyright © 2005-2008 Florian Forster <octo@verplant.org>
+       Simon Kuhnle <simon@blarzwurst.de>
+       License: GNU General Public License
+
+       File src/mysql.c
+       Copyright © 2006-2009 Florian Forster <octo@verplant.org>
+       Copyright © 2008 Mirko Buffoni <briareos@eswat.org>
+       Copyright © 2009 Doug MacEachern <dougm@hyperic.com>
+       Copyright © 2009 Sebastian Harl <sh@tokkee.org>
+       Copyright © 2009 Rodolphe Quiédeville <rquiedeville@bearstech.com>
        License: GNU General Public License
 
        File src/nfs.c
@@ -177,11 +266,6 @@ Licenses:
        Copyright © 2008 Oleg King <king2@kaluga.ru>
        License: GNU General Public License
 
-       File src/openvpn.c
-       Copyright © 2008 Doug MacEachern <dougm@hyperic.com>
-       Copyright © 2008 Florian Forster <octo@verplant.org>
-       License: GNU General Public License
-
        Files src/powerdns.c
              src/utils_tail.c
              src/utils_tail_match.c
@@ -194,6 +278,12 @@ Licenses:
        Copyright © 2005 Lyonel Vincent <lyonel@ezix.org>
        Copyright © 2006-2008 Florian Forster <octo@verplant.org> (Mach code)
        Copyright © 2008 Oleg King <king2@kaluga.ru>
+       Copyright © 2009 Sebastian Harl <sh@tokkee.org>
+       License: GNU General Public License
+
+       File src/sensors.c
+       Copyright © 2005-2008 Florian Forster <octo@verplant.org>
+       Copyright © 2006 Lubos Stanek <lubek@users.sourceforge.net>
        License: GNU General Public License
 
        File src/serial.c
@@ -204,15 +294,34 @@ Licenses:
        Copyright © 2005, 2006 Scott Garrett <sgarrett@technomancer.com>
        License: GNU General Public License
 
+       File src/tcpconns.c
+       Copyright © 2007-2008 Florian Forster <octo@verplant.org>
+       Copyright © 2008 Michael Stapelberg <michael+git@stapelberg.de>
+       License: GNU General Public License
+
        File src/teamspeak2.c
        Copyright © 2008 Stefan Hacker
        Copyright © 2008 Florian Forster
        License: GNU General Public License
 
+       File src/ted.c
+       Copyright © 2009 Eric Reed <ericr@reedhome.net>
+       License: GNU General Public License
+
        File src/thermal.c
        Copyright © 2008 Michał Mirosław <mirq-linux@rere.qmqm.pl>
        License: GNU General Public License
 
+       File src/uptime.c
+       Copyright © 2009 Marco Chiappero <marco@absence.it>
+       License: GNU General Public License
+
+       File src/users.c
+       Copyright © 2005-2007 Sebastian Harl <sh@tokkee.org>
+       Copyright © 2005 Niki W. Waibel <niki.waibel@newlogic.com>
+       Copyright © 2005-2007 Florian Forster <octo@verplant.org>
+       Copyright © 2008 Oleg King <king2@kaluga.ru>
+
        File src/utils_ignorelist.c
        Copyright © 2006 Lubos Stanek <lubek@users.sourceforge.net>
        Copyright © 2008 Florian Forster <octo@verplant.org>