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

[Aron Xu]

The following commit has been merged in the master branch:
commit 9ecc9ced94fcc1c78f72d466f5ec85418486d8d8
Author: Aron Xu <aron at debian.org>
Date:   Sun Nov 1 14:17:12 2015 +0800

    Update debian/copyright file

diff --git a/debian/copyright b/debian/copyright
index 964a0ce..1c194d9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -122,37 +122,10 @@ Copyright:
  Aron Xu <aron at debian.org>
 License: GPL-2+
 
-Files: debian/tree/zfsutils/etc/bash_completion.d/zfs
+Files: debian/tree/zfsutils/usr/share/bash-completion/completions/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
- Copyright (c) 2011, Gentoo Foundation
- All rights reserved.
- .
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- .
- Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- .
- Redistributions in binary form must reproduce the above copyright notice, this
- list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 Files: include/libnvpair.h
 Copyright: Oracle
 License: CDDL-1.0
@@ -412,10 +385,6 @@ Copyright: AT&T
  The Regents of the University of California
 License: CDDL-1.0
 
-Files: include/sys/vdev_impl.h
-Copyright: Oracle
-License: CDDL-1.0
-
 Files: include/sys/zap.h
 Copyright: Oracle
 License: CDDL-1.0
@@ -620,7 +589,7 @@ Copyright: Sun Microsystems, Inc.
  AT&T
 License: CDDL-1.0
 
-Files: lib/libspl/include/sys/mntent.h
+Files: include/sys/mntent.h
 Copyright: Sun Microsystems, Inc.
  AT&T
 License: CDDL-1.0

-- 
ZFS on Linux