Updated copyright.

diff --git a/debian/copyright b/debian/copyright
index d3f1f4a2f4be5c29ffa1f679b95ebfea580b9977..ed42f9db4c003644874753f73d6901cd25af6d23 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -37,6 +37,7 @@ Copyright Holders (in alphabetical order):
        Hideki Yamane <henrich@debian.or.jp>
        Jacobo Tarrio <jtarrio@debian.org>
        Jason Pepas <cell@ices.utexas.edu>
+       Jeff Green <jeff@kikisoso.org>
        Jonathan Kolb <jon@b0g.us>
        Juan Jose Ciarlante <jjciarla@raiz.uncu.edu.ar>
        Julian Anastasov <ja@ssi.bg>
@@ -55,6 +56,7 @@ Copyright Holders (in alphabetical order):
        Mirko Buffoni <briareos@eswat.org>
        Netfilter Core Team
        Niki W. Waibel <niki.waibel@newlogic.com>
+       noris network AG
        Novell Inc.
        Oleg King <king2@kaluga.ru>
        Ondrej 'SanTiago' Zajicek <santiago@crfreenet.org>
@@ -82,6 +84,10 @@ Copyright Holders (in alphabetical order):
 
 Licenses:
 
+       File bindings/perl/lib/Collectd/Plugins/Monitorus.pm
+       Copyright © 2009 Jeff Green <jeff@kikisoso.org>
+       License: GNU General Public License
+
        File bindings/perl/lib/Collectd/Plugins/OpenVZ.pm
        Copyright © 2009 Jonathan Kolb <jon@b0g.us>
        License: GNU General Public License
@@ -130,6 +136,11 @@ Licenses:
        Copyright © 2009 Bruno Prémont <bonbons@linux-vserver.org>
        License: GNU General Public License
 
+       File contrib/snmp-probe-host.px
+       Copyright © 2008-2009 Florian Forster <octo@verplant.org>
+       Copyright © 2009 noris network AG
+       License: GNU General Public License
+
        File debian/include/net/ip_vs.h
        Copyright © Wensong Zhang <wensong@linuxvirtualserver.org>
        Copyright © Julian Anastasov <ja@ssi.bg>