[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. upstream/0.6.5.4-658-ge25ab2b

[Petter Reinholdtsen]

The following commit has been merged in the master branch:
commit e25ab2bae62e55a65ce65da023edf41705cc70c6
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sat Feb 20 20:37:26 2016 +0000

    Document some non-CDDL files and the CDDL status of translation files.

diff --git a/debian/copyright b/debian/copyright
index 9c78c3f..8a6f13c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -118,9 +118,28 @@ Files: cmd/zvol_id/*
 Copyright: Fajar A. Nugraha.
 License: CDDL-1.0
 
-Files: config/config.guess config/config.sub config/depcomp config/ltmain.sh config/missing
+Files: config/*
 Copyright: Free Software Foundation, Inc.
-License: GPL-2+
+License: GPL-2+ with autoconf exception
+
+
+Files: config/ltoptions.m4
+       config/lt~obsolete.m4
+       config/ltversion.m4
+       config/libtool.m4
+       config/ltsugar.m4
+License: PERMISSIVE
+ This file is free software; the Free Software Foundation gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+Files: config/install-sh
+Copyright: X Consortium
+License: Expat
+
+Files: contrib/bash_completion.d/zfs
+Copyright: Aneurin Price <aneurin.price at gmail.com>
+License: Expat
 
 Files: debian/*
 Copyright:
@@ -129,6 +148,11 @@ Copyright:
  Aron Xu <aron at debian.org>
 License: GPL-2+
 
+Files: debian/po/*
+Copyright:
+ 2013, The Debian po file translators.
+License: CDDL-1.0
+
 Files: debian/tree/zfsutils/usr/share/bash-completion/completions/zfs
 Copyright: 2013, Aneurin Price <aneurin.price at gmail.com>
 License: Expat

-- 
OpenZFS on Linux