From 9cd3e06355c3e9142b8465f68b4add7ca3c5ded1 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sun, 29 Apr 2007 23:14:23 +0200 Subject: [PATCH] Updated copyright to collectd-4. --- debian/copyright | 76 +++++++++++++++--------------------------------- 1 file changed, 23 insertions(+), 53 deletions(-) diff --git a/debian/copyright b/debian/copyright index 893b66c..6a27bf8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -15,6 +15,7 @@ Copyright Holders (in alphabetical order): Anthony Gialluca David Bacher Flavio Stanchina + Florent Monbillard Florian Forster Free Software Foundation, Inc. Jason Pepas @@ -23,25 +24,21 @@ Copyright Holders (in alphabetical order): Lyonel Vincent Niki W. Waibel Peter Holik - Roy Keene, Keene Enterprises Scott Garrett Sebastian Harl + Sjoerd van der Berg Vincent Stehlé Licenses: - File contrib/collectd2html.pl + Files contrib/collectd2html.pl + src/hddtemp.c Copyright 2006 Vincent Stehlé License: GNU General Public License - Files src/apache.c - src/apple_sensors.c - src/dns.c - src/mysql.c - src/ntpd.c - src/battery.c - src/wireless.c + File src/apache.c Copyright (C) 2006 Florian Forster + Copyright (C) 2007 Florent Monbillard License: GNU General Public License File src/apcups.c @@ -50,20 +47,26 @@ Licenses: Copyright (C) 1996-99 Andre M. Hedrick License: GNU General Public License - File src/cpufreq.c - Copyright (C) 2005, 2006 Peter Holik + Files src/cpufreq.c + src/irq.c + src/multimeter.c + Copyright (C) 2005-2007 Peter Holik License: GNU General Public License - File src/hddtemp.c - Copyright (C) 2005, 2006 Vincent Stehlé + Files src/email.c + src/logfile.c + src/perl.c + src/users.c + src/vserver.c + Copyright (C) 2006-2007 Sebastian Harl License: GNU General Public License - File src/mbmon.c - Copyright (C) 2006 Flavio Stanchina + File src/iptables.c + Copyright (C) 2007 Sjoerd van der Berg License: GNU General Public License - File src/multimeter.c - Copyright (C) 2005, 2006 Peter Holik + File src/mbmon.c + Copyright (C) 2006 Flavio Stanchina License: GNU General Public License File src/nfs.c @@ -72,7 +75,7 @@ Licenses: File src/processes.c Copyright (C) 2005 Lyonel Vincent - Copyright (C) 2006 Florian Forster (Mach code) + Copyright (C) 2006-2007 Florian Forster (Mach code) License: GNU General Public License File src/serial.c @@ -83,13 +86,7 @@ Licenses: Copyright (C) 2005, 2006 Scott Garrett License: GNU General Public License - File src/users.c - Copyright (C) 2005, 2006 Sebastian Harl - License: GNU General Public License - - Files src/utils_debug.c - src/utils_debug.h - src/utils_mount.c + Files src/utils_mount.c src/utils_mount.h Copyright (C) 2005, 2006 Niki W. Waibel License: GNU General Public License @@ -99,14 +96,9 @@ Licenses: Copyright (C) 2006 Lubos Stanek License: GNU General Public License - Files src/vserver.c - src/email.c - Copyright (C) 2006 Sebastian Harl - License: GNU General Public License - All other files (except libltdl/*, src/libconfig/*, src/utils_dns.* and contrib/SpamAssassin/*): - Copyright (C) 2005, 2006 Florian Forster + Copyright (C) 2005-2007 Florian Forster License: GNU General Public License This package is free software; you can redistribute it and/or modify @@ -202,28 +194,6 @@ can be found in `/usr/share/common-licenses/LGPL'. Use whatever you like more. - Files src/libconfig/* - Copyright (C) Roy Keene - - 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 the rights to use, copy, modify, merge, - publish, distribute, sublicense, and/or sell copies of the Software, - and to permit persons to whom the Software is furnished to do so, - subject to the following conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - The Debian packaging is (C) 2006, Sebastian Harl and is licensed under the GPL, see above. -- 2.30.2