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

[Petter Reinholdtsen]

The following commit has been merged in the master branch:
commit bb37400547eb102a1e1c67a19c95f8bc94332040
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Thu Mar 24 22:41:10 2016 +0000

    List forgotten init.d script copyright holders found by looking for 'BSD'.

diff --git a/debian/copyright b/debian/copyright
index 12a00e1..8aa72e9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -199,6 +199,12 @@ 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*
+Copyright:
+  2015, Turbo Fredriksson.
+  2011, Darik Horn.
+License: BSD-2-clause
+
 Files: include/libuutil_common.h
   include/zfs_fletcher.h
   include/zfs_prop.h

-- 
OpenZFS on Linux