[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. upstream/0.6.5.5-674-g6b2c6ca

[Petter Reinholdtsen]

The following commit has been merged in the master branch:
commit 6b2c6ca82f8e0b5bd0a1d5b5662d0d17bf2862eb
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Fri Mar 25 20:56:09 2016 +0100

    Update copyright file a bit more.
    
    Track down more copyright holders for the BSD licensed init.d scripts
    by looking at upstream git repo, and be more strict on the file
    specification to match the one used before the cme based rewrite of
    the copyright file.

diff --git a/debian/copyright b/debian/copyright
index 8aa72e9..0fcd6c0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -199,9 +199,14 @@ Files: debian/tree/zfsutils/usr/share/bash-completion/completions/zfs
 Copyright: 2010, Aneurin Price <aneurin.price at gmail.com>
 License: Expat
 
-Files: etc/init.d/zfs*
+Files: etc/init.d/zfs-*.in
 Copyright:
-  2015, Turbo Fredriksson.
+  2016, Carlo Landmeter <clandmeter at gmail.com>
+  2015, James Lee <jlee at thestaticvoid.com>
+  2015, Richard Yao <ryao at gentoo.org>
+  2015, SenH <sen at senhaerens.be>
+  2015, Turbo Fredriksson <turbo at bayour.com>
+  2015, yuina822 <ayuichi at club.kyutech.ac.jp>
   2011, Darik Horn.
 License: BSD-2-clause
 

-- 
OpenZFS on Linux