convert all collectd.org URLs to https

[pkg-collectd.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index a2b3737ce6ae1f7f408481eb7fe6913c2918824b..54fac4156ac51db17a6a56c28fa88a88661e036c 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 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/>.
+It was downloaded from <https://collectd.org/files/>.
 
 Upstream Authors:
        Core Developer:
@@ -323,6 +323,7 @@ Licenses:
        Copyright © 2005-2006 Vincent Stehlé <vincent.stehle@free.fr>
        Copyright © 2006-2007 Florian Forster <octo@verplant.org>
        Copyright © 2008 Sebastian Harl <sh@tokkee.org>
+       Copyright © 2014 Carnegie Mellon University
        License: GNU General Public License
 
        File src/ipc.c
@@ -638,7 +639,7 @@ Licenses:
        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
+       Some files are licensed under version 2 only, while any others allow one to
        use version 2 or (at your option) any later version.
 
 On Debian systems, the complete text of the GNU General Public License,
@@ -804,16 +805,19 @@ can be found in `/usr/share/common-licenses/LGPL'.
              contrib/cussh.pl
              proto/collectd.proto
              proto/types.proto
-             src/grpc.cc
              src/types.db.pod
              src/utils_cmd_flush.h
              src/utils_curl_stats.c
              src/utils_curl_stats.h
              src/daemon/utils_subst.c
              src/daemon/utils_subst.h
-       Copyright © 2006-2009 Sebastian Harl <sh@tokkee.org>
+       Copyright © 2006-2016 Sebastian Harl <sh@tokkee.org>
        License: MIT License
 
+       File src/grpc.cc
+       Copyright © 2015-2016 Sebastian Harl <sh@tokkee.org>
+       Copyright © 2016 Florian Forster <octo@verplant.org>
+
        File contrib/collection.cgi
        Copyright © 2006-2010 Florian Forster <octo@collectd.org>
        2006-2008 Sebastian Harl <sh@tokkee.org>
@@ -825,17 +829,23 @@ can be found in `/usr/share/common-licenses/LGPL'.
        Copyright © 2010-2012 Florian Forster <octo@verplant.org>
        License: MIT License
 
+       File src/battery_statefs.c
+       Copyright © 2016 rinigus
+       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/utils_cmds.c
+             src/utils_cmds.h
              src/daemon/utils_complain.c
              src/daemon/utils_complain.h
              src/vserver.c
        Copyright © 2006-2013 Florian Forster
-       Copyright © 2006-2009 Sebastian Harl
+       Copyright © 2006-2016 Sebastian Harl
        License: MIT License
 
        Files src/collectd-python.pod
@@ -863,6 +873,10 @@ can be found in `/usr/share/common-licenses/LGPL'.
        Copyright © 2014 Tim Laszlo <tim.laszlo@gmail.com>
        License: MIT License
 
+       File src/dpdkstat.c
+       Copyright © 2016 Intel Corporation
+       License: MIT License
+
        File src/fhcount.c
        Copyright © 2015 Jiri Tyr <jiri.tyr@gmail.com>
        License: MIT License
@@ -871,6 +885,14 @@ can be found in `/usr/share/common-licenses/LGPL'.
        Copyright © 2015 Nicolas JOURDEN <nicolas.jourden@laposte.net>
        License: MIT License
 
+       File src/hugepages.c
+       Copyright © 2016 Intel Corporation
+       License: MIT License
+
+       File src/intel_rdt.c
+       Copyright © 2016 Intel Corporation
+       License: MIT License
+
        File src/log_logstash.c
        Copyright © 2013 Pierre-Yves Ritschard
        License: MIT License
@@ -895,9 +917,9 @@ can be found in `/usr/share/common-licenses/LGPL'.
        Copyright © 2005-2013 Florian octo Forster <octo@verplant.org>
        License: MIT License
 
-       Files src/daemon/utils_tail.c
-             src/daemon/utils_tail_match.c
-             src/daemon/utils_tail_match.h
+       Files src/utils_tail.c
+             src/utils_tail_match.c
+             src/utils_tail_match.h
        Copyright © 2007-2008 C-Ware, Inc.
        Copyright © 2008 Florian Forster
        License: MIT License
@@ -943,6 +965,12 @@ can be found in `/usr/share/common-licenses/LGPL'.
        Copyright © 2013 Florian 'octo' Forster <octo@collectd.org>
        License: MIT License
 
+       Files src/utils_latency_config.c
+             src/utils_latency_config.h
+       Copyright © 2013-2016 Florian 'octo' Forster <octo@collectd.org>
+       Copyright © 2016 Pavel Rochnyak <pavel2000@ngs.ru>
+       License: MIT License
+
        Files src/utils_format_kairosdb.c
              src/utils_format_kairosdb.h
        Copyright © 2016 Aurelien beorn Rougemont <beorn@gandi.net>
@@ -1012,7 +1040,7 @@ can be found in `/usr/share/common-licenses/LGPL'.
        Copyright © 2006 Alexander Wirt <formorer@formorer.de>
 
        This program is free software; you can redistribute it and/or modify it
-       under the the terms of either:
+       under the terms of either:
 
        a) the Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)