copyright: Updated for 4.6.3.

[pkg-collectd.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index a13b787425394a4777717b2810df8c4962af8ec0..bc1bd461f8e2d5b86bb8951a787be8ea90fe7b65 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-This package was debianized by Sebastian Harl <sh@tokkee.org> on
+This package was debianized by Sebastian Harl <tokkee@debian.org> on
 Wed, 10 May 2006 09:20:39 +0200.
 
 It was downloaded from <http://collectd.org/files/>.
@@ -35,7 +35,9 @@ Copyright Holders (in alphabetical order):
        Lubos Stanek <lubek@users.sourceforge.net>
        Lyonel Vincent <lyonel@ezix.org>
        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>
@@ -45,6 +47,7 @@ Copyright Holders (in alphabetical order):
        Red Hat Inc.
        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>
@@ -67,11 +70,9 @@ Licenses:
              src/notify_desktop.c
              src/perl.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
 
@@ -102,10 +103,15 @@ Licenses:
        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>
+       Copyright © 1996-1999 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
@@ -116,13 +122,22 @@ 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/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 +145,37 @@ 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/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>
        License: GNU General Public License
 
        File src/ipvs.c
@@ -162,11 +196,18 @@ Licenses:
 
        File src/mbmon.c
        Copyright © 2006 Flavio Stanchina
+       Copyright © 2006-2007 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>
+       License: GNU General Public License
+
+       File src/mysql.c
+       Copyright © 2006-2009 Florian Forster <octo@verplant.org>
+       Copyright © 2008 Mirko Buffoni <briareos@eswat.org>
        License: GNU General Public License
 
        File src/nfs.c
@@ -179,7 +220,7 @@ Licenses:
 
        File src/openvpn.c
        Copyright © 2008 Doug MacEachern <dougm@hyperic.com>
-       Copyright © 2008 Florian Forster <octo@verplant.org>
+       Copyright © 2009 Florian Forster <octo@verplant.org>
        License: GNU General Public License
 
        Files src/powerdns.c
@@ -192,8 +233,14 @@ Licenses:
 
        File src/processes.c
        Copyright © 2005 Lyonel Vincent <lyonel@ezix.org>
-       Copyright © 2006-2008 Florian Forster <octo@verplant.org> (Mach code)
+       Copyright © 2006-2008 Florian Forster <octo@verplant.org>
        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,6 +251,11 @@ 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
@@ -213,6 +265,13 @@ Licenses:
        Copyright © 2008 Michał Mirosław <mirq-linux@rere.qmqm.pl>
        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>
+       License: GNU General Public License
+
        File src/utils_ignorelist.c
        Copyright © 2006 Lubos Stanek <lubek@users.sourceforge.net>
        Copyright © 2008 Florian Forster <octo@verplant.org>
@@ -247,14 +306,15 @@ Licenses:
 
        You should have received a copy of the GNU General Public License
        along with this package; if not, write to the Free Software
-       Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, 
+       Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
        USA.
 
        Some files are licensed under version 2 only, while any others allow to
        use version 2 or (at your option) any later version.
 
-On Debian systems, the complete text of the GNU General Public License 
-can be found in `/usr/share/common-licenses/GPL'.
+On Debian systems, the complete text of the GNU General Public License,
+version 2, can be found in `/usr/share/common-licenses/GPL-2'. The complete
+text of the latest version can be found in `/usr/share/common-licenses/GPL'.
 
        File libltdl/ltdl.c
        Copyright © 1998-2001, 2003-2007 Free Software Foundation, Inc.
@@ -278,10 +338,10 @@ can be found in `/usr/share/common-licenses/GPL'.
 
        You should have received a copy of the GNU Lesser General Public
        License along with this library; if not, write to the Free Software
-       Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, 
+       Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
        USA.
 
-On Debian systems, the complete text of the GNU Lesser General Public License 
+On Debian systems, the complete text of the GNU Lesser General Public License
 can be found in `/usr/share/common-licenses/LGPL'.
 
        Parts of the file src/tcpconns.c
@@ -303,7 +363,7 @@ can be found in `/usr/share/common-licenses/LGPL'.
        1. Redistributions of source code must retain the above copyright notice,
           this list of conditions and the following disclaimer.
        2. Redistributions in binary form must reproduce the above copyright
-          notice, this list of conditions and the following disclaimer in the 
+          notice, this list of conditions and the following disclaimer in the
           documentation and/or other materials provided with the distribution.
        3. Neither the name of The Measurement Factory nor the names of its
           contributors may be used to endorse or promote products derived from
@@ -335,13 +395,13 @@ can be found in `/usr/share/common-licenses/LGPL'.
 
        Use whatever you like more.
 
-The Debian packaging is © 2006-2008, Sebastian Harl <sh@tokkee.org> and
+The Debian packaging is © 2006-2009, Sebastian Harl <tokkee@debian.org> and
 is licensed under the GPL, see above. The debconf template translations are
 distributed under the same license as the package itself.
 
        de.po:
        Copyright © 2008 Kai Wasserbäch <debian@carbon-project.org>
-       Copyright © 2008 Sebastian Harl <sh@tokkee.org>
+       Copyright © 2008 Sebastian Harl <tokkee@debian.org>
 
        fr.po:
        Copyright © 2008 Florent Usseil <swiip81@free.fr>