[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. upstream/0.6.4.2-611-gebc9021

[Aron Xu]

The following commit has been merged in the master branch:
commit ebc9021e998b15753fa73060f96a530f14d67571
Author: Aron Xu <aron at debian.org>
Date:   Thu Aug 13 22:41:31 2015 +0800

    Update copyright

diff --git a/debian/copyright b/debian/copyright
index fe8aa01..38270d6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -60,11 +60,6 @@ Copyright: Oracle
  Delphix
 License: CDDL-1.0
 
-Files: cmd/zfs/zfs_main.h
-Copyright: Oracle
- Nexenta Systems, Inc.
-License: CDDL-1.0
-
 Files: cmd/zfs/zfs_util.?
 Copyright: Oracle
 License: CDDL-1.0
@@ -116,32 +111,21 @@ Files: cmd/zvol_id/*
 Copyright: Fajar A. Nugraha.
 License: CDDL-1.0
 
-Files: config/config.guess
-Copyright: Free Software Foundation, Inc.
-License: GPL-2+
-
-Files: config/config.sub
-Copyright: Free Software Foundation, Inc.
-License: GPL-2+
-
-Files: config/depcomp
-Copyright: Free Software Foundation, Inc.
-License: GPL-2+
-
-Files: config/ltmain.sh
-Copyright: Free Software Foundation, Inc.
-License: GPL-2+
-
-Files: config/missing
+Files: config/config.guess config/config.sub config/depcomp config/ltmain.sh config/missing
 Copyright: Free Software Foundation, Inc.
 License: GPL-2+
 
 Files: debian/*
-Copyright: Darik Horn <dajhorn at vanadac.com>
+Copyright:
+ Darik Horn <dajhorn at vanadac.com>
  Carlos Alberto Lopez Perez <clopez at igalia.com>
  Aron Xu <aron at debian.org>
 License: GPL-2+
 
+Files: debian/tree/zfsutils/etc/bash_completion.d/zfs
+Copyright: 2013, Aneurin Price <aneurin.price at gmail.com>
+License: Expat
+
 Files: etc/init.d/zfs.gentoo.in
 Copyright: Gentoo Foundation
 License: BSD-2-clause
@@ -200,14 +184,6 @@ Files: include/sys/arc.h
 Copyright: Oracle
 License: CDDL-1.0
 
-Files: include/avl.h
-Copyright: Sun Microsystems, Inc.
-License: CDDL-1.0
-
-Files: include/avl_impl.h
-Copyright: Sun Microsystems, Inc.
-License: CDDL-1.0
-
 Files: include/sys/bplist.h
 Copyright: Oracle
 License: CDDL-1.0
@@ -318,10 +294,6 @@ Files: include/sys/rrwlock.h
 Copyright: Sun Microsystems, Inc.
 License: CDDL-1.0
 
-Files: include/sys/refcount.h
-Copyright: Oracle
-License: CDDL-1.0
-
 Files: include/sys/sa.h
 Copyright: Oracle
 License: CDDL-1.0
@@ -361,7 +333,7 @@ License: CDDL-1.0
 Files: include/sys/u8_textprep_data.h
 Copyright: Unicode, Inc.
  Sun Microsystems, Inc.
-License:
+License: Expat~Unicode
  Permission is hereby granted, free of charge, to any person obtaining
  a copy of the Unicode data files and any associated documentation (the
  "Data Files") or Unicode software and any associated documentation (the
@@ -415,10 +387,6 @@ License: CDDL-1.0
 
 Files: include/sys/unique.h
 Copyright: Sun Microsystems, Inc.
-License: CDDL-1.0
-
-Files: include/sys/unique.h
-Copyright: Sun Microsystems, Inc.
  Hewlett-Packard Company
  Open Software Foundation, Inc.
  Digital Equipment Corporation.
@@ -647,12 +615,6 @@ Files: lib/libspl/include/*
 Copyright: Sun Microsystems, Inc.
 License: CDDL-1.0
 
-Files: lib/libspl/include/byteorder.h
-Copyright: Sun Microsystems, Inc.
- AT&T
- The Regents of the University of California
-License: CDDL-1.0
-
 Files: lib/libspl/include/sys/dktp/fdisk.h
 Copyright: Sun Microsystems, Inc.
  AT&T
@@ -1275,6 +1237,31 @@ Copyright: Cluster File Systems, Inc.
  Lawrence Livermore National Security, LLC.
 License: GPL-2+
 
+Files: scripts/kmodtool
+Copyright: 2003-2012, Ville Skyttä <ville.skytta at iki.fi>,
+ 2003-2012, Thorsten Leemhuis <fedora at leemhuis.info>
+ 2003-2012, Nicolas Chauvet <kwizart at gmail.com>
+License: Expat
+ 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.
+
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software

-- 
ZFS on Linux