Merged branch 'collectd-4'.

[pkg-collectd.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 7d04a4a6cfe04ae0b7ae21254af5bb358487f783..f8ae8bf165ec76a55162ef2da4652238f10b00e6 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -72,6 +72,7 @@ Copyright Holders (in alphabetical order):
        Rodolphe Quiédeville <rquiedeville@bearstech.com>
        Scott Garrett <sgarrett@technomancer.com>
        Sebastian Harl <sh@tokkee.org>
+       Sebastien Pahl <sebastien.pahl@dotcloud.com>
        Simon Kuhnle <simon@blarzwurst.de>
        Sjoerd van der Berg <harekiet@users.sourceforge.net>
        Stefan Hacker <d0t@dbclan.de>
@@ -153,7 +154,7 @@ Licenses:
        License: GNU General Public License
 
        File src/apache.c
-       Copyright © 2006-2009 Florian Forster <octo@verplant.org>
+       Copyright © 2006-2010 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
@@ -172,7 +173,7 @@ Licenses:
 
        File src/bind.c
        Copyright © 2009 Bruno Prémont <bonbons@linux-vserver.org>
-       Copyright © 2009 Florian Forster <octo@verplant.org>
+       Copyright © 2009,2010 Florian Forster <octo@verplant.org>
        License: GNU General Public License
 
        Files src/collectd-perl.pod
@@ -192,6 +193,11 @@ Licenses:
        Copyright © 2009 Sven Trenkel <collectd@semidefinite.de>
        License: GNU General Public License
 
+       File src/collectdctl.c
+       Copyright © 2010 Håkon J Dugstad Johnsen <hakon-dugstad.johnsen@telenor.com>
+       Copyright © 2010 Sebastian Harl <sh@tokkee.org>
+       License: GNU General Public License
+
        File src/conntrack.c
        Copyright © 2009 Tomasz Pala <gotar@pld-linux.org>
        License: GNU General Public License
@@ -548,7 +554,7 @@ On Debian systems, the complete text of the GNU Lesser General Public License
 can be found in `/usr/share/common-licenses/LGPL'.
 
        Files libltdl/m4/*
-       Copyright © 1996-2008 Free Software Foundation, Inc.
+       Copyright © 1996-2009 Free Software Foundation, Inc.
 
        This file is free software; the Free Software Foundation gives
        unlimited permission to copy and/or distribute it, with or without
@@ -635,6 +641,11 @@ can be found in `/usr/share/common-licenses/LGPL'.
        Copyright © 2009 Sven Trenkel <collectd@semidefinite.de>
        License: MIT License
 
+       File src/amqp.c
+       Copyright © 2009 Sebastien Pahl <sebastien.pahl@dotcloud.com>
+       Copyright © 2010 Florian Forster <octo@verplant.org>
+       License: MIT License
+
        Permission is hereby granted, free of charge, to any person obtaining a
        copy of this software and associated documentation files (the "Software"),
        to deal in the Software without restriction, including without limitation