Updated copyright for 5.5.0.

diff --git a/debian/copyright b/debian/copyright
index b494bc7e78e28422c982995e8f2aac06f275183e..b0ed0ca616d4db34321b43a1ec45c27d7777e441 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,12 +19,14 @@ Copyright Holders (in alphabetical order):
        Andre M. Hedrick <andre@suse.com>
        Andreas Henriksson <andreas@fatal.se>
        Andrés J. Díaz <ajdiaz at connectical.com>
+       Andy Parkins <andyp at fussylogic.co.uk>
        Anthony Dewhurst <dewhurst@gmail>
        Anthony Gialluca <tonyabg@charter.net>
        Antony Dovgal <tony@daylessday.org>
        Battelle Memorial Institute
        Bert Vermeulen <bert@biot.com>
        Bruno Prémont <bonbons@linux-vserver.org>
+       Carnegie Mellon University
        Chad Malfait <malfaitc@yahoo.com>
        Clay Loveless <clay@killersoft.com>
        Clément Stenac <clement.stenac@diwi.org>
@@ -37,27 +39,35 @@ Copyright Holders (in alphabetical order):
        Eric Reed <ericr@reedhome.net>
        Eric Spreen <erispre@gmail.com>
        Fabian Schuh <mail@xeroc.org>
+       Fabrice A. Marie <fabrice at kibinlabs.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.
+       Google, Inc.
        Hideki Yamane <henrich@debian.or.jp>
+       Intel Corporation.
        Ivan Masár <helix84@centrum.sk
        Jacobo Tarrio <jtarrio@debian.org>
        Jason Pepas <cell@ices.utexas.edu>
        Jeff Green <jeff@kikisoso.org>
        Jérôme Renard <jerome.renard@gmail.com>
+       Jiri Tyr <jiri.tyr at gmail.com>
        Joe Dalton <joedalton2@yahoo.dk>
        Jonathan Kolb <jon@b0g.us>
        Jorge Barreiro <yortx.barry@gmail.com>
+       joseph werle <joseph.werle@gmail.com>
        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
+       Kimo Rosenbaum <kimor79 at yahoo.com>
        Kris Nielander <nielander@fox-it.com>
+       Laird Shaw
+       Limelight Networks, Inc.
        Lubos Stanek <lubek@users.sourceforge.net>
        Lyonel Vincent <lyonel@ezix.org>
        Manuel Sanmartin
@@ -66,11 +76,13 @@ Copyright Holders (in alphabetical order):
        Mariusz Gronczewski <xani666@gmail.com>
        Martin Bagge <brother@bsnet.se>
        Martin Sin <martin.sin@zshk.cz>
+       Max Henkel <henkel at gmx.at>
        Michael Hanselmann
        Michael Stapelberg <michael+git@stapelberg.de>
        Michał Mirosław <mirq-linux@rere.qmqm.pl>
        Mirko Buffoni <briareos@eswat.org>
        Netfilter Core Team
+       New Dream Network
        Nicolas Szalay
        Niki W. Waibel <niki.waibel@newlogic.com>
        noris network AG
@@ -87,6 +99,7 @@ Copyright Holders (in alphabetical order):
        Red Hat Inc.
        Rodolphe Quiédeville <rquiedeville@bearstech.com>
        Scott Garrett <sgarrett@technomancer.com>
+       Scott Sanders <scott at jssjr.com>
        Sebastian Harl <sh@tokkee.org>
        Sebastien Pahl <sebastien.pahl@dotcloud.com>
        Simon Kuhnle <simon@blarzwurst.de>
@@ -97,9 +110,13 @@ Copyright Holders (in alphabetical order):
        Steven Clarke <steven@monmouth.demon.co.uk>
        Sven Trenkel <collectd@semidefinite.de>
        The Regents of the University of California
+       Tim Laszlo <tim.laszlo at gmail.com>
        Tomasz Pala <gotar@pld-linux.org>
+       Vedran Bartonicek <vbartoni at gmail.com>
+       Vincent Bernat <vincent at bernat.im>
        Vincent Stehlé <vincent.stehle@free.fr>
        Wensong Zhang <wensong@linuxvirtualserver.org>
+       Wilfried Goesgens <dothebart at citadel.org>
        Wouter Gadeyne
        Xin Li <delphij@FreeBSD.org>
        Yuri Kozlov <yuray@komyakino.ru>
@@ -114,23 +131,6 @@ Licenses:
        Copyright © 2009 Jonathan Kolb <jon@b0g.us>
        License: GNU General Public License
 
-       Files bindings/perl/lib/Collectd.pm
-             contrib/examples/MyPlugin.pm
-             contrib/examples/myplugin.c
-             contrib/cussh.pl
-             src/collectdmon.c
-             src/collectdmon.pod
-             src/email.c
-             src/notify_desktop.c
-             src/perl.c
-             src/table.c
-             src/types.db.pod
-             src/utils_cmd_flush.h
-             src/utils_subst.c
-             src/utils_subst.h
-       Copyright © 2006-2009 Sebastian Harl <sh@tokkee.org>
-       License: GNU General Public License
-
        File contrib/collectd_network.py
        Copyright © 2009 Adrian Perez <aperez@igalia.com>
        License: GNU General Public License
@@ -196,8 +196,9 @@ Licenses:
        License: GNU General Public License
 
        File src/battery.c
-       Copyright © 2006-2007 Florian Forster <octo@verplant.org>
+       Copyright © 2006-2014 Florian Forster <octo@verplant.org>
        Copyright © 2008 Michał Mirosław <mirq-linux@rere.qmqm.pl>
+       Copyright © 2014 Andy Parkins
        License: GNU General Public License
 
        File src/bind.c
@@ -205,24 +206,18 @@ Licenses:
        Copyright © 2009,2010 Florian Forster <octo@verplant.org>
        License: GNU General Public License
 
+       File src/ceph.c
+       Copyright © 2011 New Dream Network
+       Copyright © 2011 Colin McCabe <cmccabe@alumni.cmu.edu>
+       Copyright © 2014 Dennis Zou <yunzou@cisco.com>
+       Copyright © 2014 Dan Ryder <daryder@cisco.com>
+       License: GNU General Public License
+
        File src/cgroups.c
        Copyright © 2011 Michael Stapelberg <michael@stapelberg.de>
        Copyright © 2013 Florian Forster <octo@collectd.org>
        License: GNU General Public License
 
-       Files src/collectd-perl.pod
-             src/logfile.c
-             src/match_regex.c
-             src/nginx.c
-             src/scanner.l
-             src/utils_cmd_flush.c
-             src/utils_complain.c
-             src/utils_complain.h
-             src/vserver.c
-       Copyright © 2006-2013 Florian Forster
-       Copyright © 2006-2009 Sebastian Harl
-       License: GNU General Public License
-
        File src/collectd-python.pod
        Copyright © 2009 Sven Trenkel <collectd@semidefinite.de>
        License: GNU General Public License
@@ -238,13 +233,15 @@ Licenses:
 
        File src/contextswitch.c
        Copyright © 2009 Patrik Weiskircher <weiskircher@inqnet.at>
+       Copyright © 2010 Kimo Rosenbaum
        License: GNU General Public License
 
        File src/cpu.c
-       Copyright © 2005-2009 Florian Forster <octo@verplant.org>
+       Copyright © 2005-2014 Florian Forster <octo@verplant.org>
        Copyright © 2008 Oleg King <king2@kaluga.ru>
        Copyright © 2009 Simon Kuhnle <simon@blarzwurst.de>
        Copyright © 2009 Manuel Sanmartin
+       Copyright © 2013-2014 Pierre-Yves Ritschard <pyr@spootnik.org>
        License: GNU General Public License
 
        Files src/cpufreq.c
@@ -310,6 +307,11 @@ Licenses:
        Copyright © 2008 Sebastian Harl <sh@tokkee.org>
        License: GNU General Public License
 
+       File src/ipc.c
+       Copyright © 2010 Andres J. Diaz <ajdiaz@connectical.com>
+       Copyright © 2010 Manuel L. Sanmartin <manuel.luis@gmail.com>
+       License: GNU General Public License
+
        File src/ipmi.c
        Copyright © 2008-2009 Florian Forster <octo@verplant.org>
        Copyright © 2008 Peter Holik <peter@holik.at>
@@ -346,6 +348,7 @@ Licenses:
 
        File src/lvm.c
        Copyright © 2013 Chad Malfait <malfaitc@yahoo.com>
+       Copyright © 2014 Carnegie Mellon University
        License: GNU General Public License
 
        File src/madwifi.c
@@ -434,10 +437,7 @@ Licenses:
        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
-             src/utils_tail_match.h
+       File src/powerdns.c
        Copyright © 2007-2008 C-Ware, Inc.
        Copyright © 2008 Florian Forster
        License: GNU General Public License
@@ -473,9 +473,10 @@ Licenses:
        License: GNU General Public License
 
        File src/swap.c
-       Copyright © 2005-2012 Florian Forster <octo@verplant.org>
+       Copyright © 2005-2014 Florian Forster <octo@verplant.org>
        Copyright © 2009 Stefan Völkel <bd@bc-bd.org>
        Copyright © 2009 Manuel Sanmartin
+       Copyright © 2010 Aurélien Reynaud
        License: GNU General Public License
 
        File src/tail_csv.c
@@ -509,6 +510,10 @@ Licenses:
        Copyright © 2009 Paul Sadauskas <psadauskas@gmail.com>
        License: GNU General Public License
 
+       File src/turbostat.c
+       Copyright © 2013 Intel Corporation.
+       License: GNU General Public License
+
        File src/uptime.c
        Copyright © 2009 Marco Chiappero <marco@absence.it>
        License: GNU General Public License
@@ -543,16 +548,6 @@ Licenses:
        Copyright © 2005, 2006 Niki W. Waibel <niki.waibel@gmx.net>
        License: GNU General Public License
 
-       File src/utils_tail.h
-       Copyright © 2007-2008 C-Ware, Inc.
-       License: GNU General Public License
-
-       File src/utils_threshold.c
-       Copyright © 2007-2009 Florian Forster <octo@verplant.org>
-       Copyright © 2008-2009 Sebastian Harl <sh@tokkee.org>
-       Copyright © 2009 Andrés J. Díaz <ajdiaz@connectical.com>
-       License: GNU General Public License
-
        File src/varnish.c
        Copyright © 2010 Jérôme Renard
        Copyright © 2010 Marc Fournier
@@ -568,7 +563,7 @@ Licenses:
        License: GNU General Public License
 
        File src/write_http.c
-       Copyright © 2007-2009 Florian Forster <octo@verplant.org>
+       Copyright © 2007-2014 Florian Forster <octo@verplant.org>
        Copyright © 2009 Paul Sadauskas <psadauskas@gmail.com>
        Copyright © 2009 Doug MacEachern <dougm@hyperic.com>
        License: GNU General Public License
@@ -578,8 +573,13 @@ Licenses:
        Copyright © 2010 Akkarit Sangpetch
        Copyright © 2012 Chris Lundquist
 
-       All other files (except otherwise listed):
-       Copyright © 2005-2013 Florian Forster <octo@verplant.org>
+       File src/write_tsdb.c
+       Copyright © 2009 Paul Sadauskas
+       Copyright © 2009 Doug MacEachern
+       Copyright © 2011 Scott Sanders
+       Copyright © 2012 Pierre-Yves Ritschard
+       Copyright © 2007-2013 Florian octo Forster
+       Copyright © 2013-2014 Limelight Networks, Inc.
        License: GNU General Public License
 
        This package is free software; you can redistribute it and/or modify
@@ -629,6 +629,10 @@ text of the latest version can be found in `/usr/share/common-licenses/GPL'.
        Copyright © 1998-2011 Free Software Foundation, Inc.
        License: GNU Lesser General Public License
 
+       File src/barometer.c
+       Copyright © 2014 Tomas Menzl
+       License: GNU Lesser General Public License
+
        File src/network.c
        Copyright © 2005-2013 Florian Forster <octo@verplant.org>
        Copyright © 2009 Aman Gupta <aman@tmm1.net>
@@ -726,11 +730,6 @@ can be found in `/usr/share/common-licenses/LGPL'.
        Copyright © 2012 Sebastian 'tokkee' Harl <sh@tokkee.org>
        License: 2-clause BSD License
 
-       File src/postgresql.c
-       Copyright © 2008-2012 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
@@ -761,6 +760,21 @@ can be found in `/usr/share/common-licenses/LGPL'.
        Copyright © 2010-2012 Florian Forster <octo@verplant.org>
        License: MIT License
 
+       Files src/collectd-perl.pod
+             src/logfile.c
+             src/match_regex.c
+             src/nginx.c
+             src/scanner.l
+             src/utils_cmd_flush.c
+             src/daemon/utils_complain.c
+             src/daemon/utils_complain.h
+             src/daemon/utils_tail_match.c
+             src/daemon/utils_tail_match.h
+             src/vserver.c
+       Copyright © 2006-2013 Florian Forster
+       Copyright © 2006-2009 Sebastian Harl
+       License: MIT License
+
        Files src/collectd-python.pod
              src/cpython.h
              src/pyconfig.c
@@ -769,18 +783,111 @@ can be found in `/usr/share/common-licenses/LGPL'.
        Copyright © 2009-2010 Sven Trenkel <collectd@semidefinite.de>
        License: MIT License
 
+       File src/drbd.c
+       Copyright © 2014 Tim Laszlo <tim.laszlo at gmail.com>
+       License: MIT License
+
+       Files src/collectdmon.c
+             src/collectdmon.pod
+             src/email.c
+             src/notify_desktop.c
+             src/perl.c
+             src/table.c
+       Copyright © 2006-2009 Sebastian Harl <sh@tokkee.org>
+       License: MIT License
+
+       File src/fhcount.c
+       Copyright © 2015 Jiri Tyr <jiri.tyr at gmail.com>
+       License: MIT License
+
+       File src/log_logstash.c
+       Copyright © 2013 Pierre-Yves Ritschard
+       License: MIT License
+
        Files src/libcollectdclient/collectd/lcc_features.h
              src/libcollectdclient/collectd/lcc_features.h.in
        Copyright © 2009 Sebastian Harl <sh@tokkee.org>
        License: MIT License
 
+       Files bindings/perl/lib/Collectd.pm
+             contrib/examples/MyPlugin.pm
+             contrib/examples/myplugin.c
+             contrib/cussh.pl
+             src/types.db.pod
+             src/utils_cmd_flush.h
+             src/daemon/utils_subst.c
+             src/daemon/utils_subst.h
+       Copyright © 2006-2009 Sebastian Harl <sh@tokkee.org>
+       License: MIT License
+
+       Other files in src/libcollectdclient/ and src/daemon/utils_random.*
+       Copyright © 2005-2013 Florian octo Forster <octo@verplant.org>
+       License: MIT License
+
+       File src/daemon/utils_tail.c
+       Copyright © 2007-2008 C-Ware, Inc.
+       Copyright © 2008 Florian Forster
+       License: MIT License
+
+       File src/daemon/utils_tail.h
+       Copyright © 2007-2008 C-Ware, Inc.
+       License: MIT License
+
+       File src/daemon/utils_threshold.c
+       Copyright © 2007-2009 Florian Forster <octo@verplant.org>
+       Copyright © 2008-2009 Sebastian Harl <sh@tokkee.org>
+       Copyright © 2009 Andrés J. Díaz <ajdiaz@connectical.com>
+       Copyright © 2014 Pierre-Yves Ritschard <pyr at spootnik.org>
+       License: MIT License
+
        File src/netapp.c
        Copyright © 2009-2010 Sven Trenkel <collectd@semidefinite.de>
        Copyright © 2012-2013 teamix GmbH
        License: MIT License
 
-       Other files in src/libcollectdclient/ and src/utils_random.*
-       Copyright © 2005-2013 Florian octo Forster <octo@verplant.org>
+       File src/openldap.c
+       Copyright © 2011 Kimo Rosenbaum <kimor79 at yahoo.com>
+       Copyright © 2014 Marc Fournier <marc.fournier at camptocamp.com>
+       License: MIT License
+
+       File src/postgresql.c
+       Copyright © 2008-2012 Sebastian Harl <sh@tokkee.org>
+       Copyright © 2009 Florian Forster <octo@verplant.org>
+       License: MIT Licence
+
+       File src/smart.c
+       Copyright © 2014 Vincent Bernat <vbe at exoscale.ch>
+       License: MIT License
+
+       Files src/statsd.c
+             src/utils_latency.c
+             src/utils_latency.h
+       Copyright © 2013 Florian 'octo' Forster <octo@collectd.org>
+       License: MIT License
+
+       File src/write_kafka.c
+       Copyright © 2014 Pierre-Yves Ritschard <pyr@spootnik.org>
+       License: MIT License
+
+       File src/write_log.c
+       Copyright © 2015 Pierre-Yves Ritschard <pyr@spootnik.org>
+       License: MIT License
+
+       File src/write_riemann.c
+       Copyright © 2012, 2013 Pierre-Yves Ritschard <pyr@spootnik.org>
+       Copyright © 2013 Florian octo Forster <octo@collectd.org>
+       License: MIT License
+
+       File src/write_sensu.c
+       Copyright © 2015 Fabrice A. Marie <fabrice at kibinlabs.com>
+       License: MIT License
+
+       File src/zookeeper.c
+       Copyright © 2014 Google, Inc.
+       License: MIT License
+
+       All other files (except otherwise listed):
+       Copyright © 2005-2015 Florian Forster <octo@verplant.org>
        License: MIT License
 
        Permission is hereby granted, free of charge, to any person obtaining a
@@ -805,15 +912,6 @@ can be found in `/usr/share/common-licenses/LGPL'.
        Copyright © 2010 Pierre-Yves Ritschard <pyr@openbsd.org>
        Copyright © 2011 Stefan Rinkes <stefan.rinkes@gmail.org>
 
-       Files src/statsd.c
-             src/utils_latency.c
-             src/utils_latency.h
-       Copyright © 2013 Florian 'octo' Forster <octo@collectd.org>
-
-       File src/write_riemann.c
-       Copyright © 2012, 2013 Pierre-Yves Ritschard <pyr@spootnik.org>
-       Copyright © 2013 Florian octo Forster <octo@collectd.org>
-
        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.