Merge tag 'upstream/0.6.5.5'

[mirror_spl-debian.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 5f1e4287a48551ade655b705603d8772cc75a2f5..c0db13044c0a2e64dd1ef39225a48f08f8abac7c 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Solaris Porting Layer for Linux
 Upstream-Contact: Brian Behlendorf <behlendorf1@llnl.gov>
-Source: https://github.com/zfsonlinux/zfs/
+Source: https://github.com/zfsonlinux/spl/
 Disclaimer:
  This work was produced at the Lawrence Livermore National Laboratory
  (LLNL) under Contract No. DE-AC52-07NA27344 (Contract 44) between
@@ -24,7 +24,7 @@ Disclaimer:
  herein do not necessarily state or reflect those of the Untied States
  Government or Lawrence Livermore National Security, LLC, and shall
  not be used for advertising or product endorsement purposes.
- 
+
 Files: *
 Copyright: Lawrence Livermore National Security, LLC.
  The Regents of the University of California
@@ -85,7 +85,8 @@ License: GPL-2+
 
 Files: debian/*
 Copyright: Darik Horn <dajhorn@vanadac.com>
-Source: https://github.com/dajhorn/pkg-spl/
+ Carlos Alberto Lopez Perez <clopez@igalia.com>
+ Aron Xu <aron@debian.org>
 License: GPL-2+
 
 Files: include/linux/zlib_compat.h
@@ -145,3 +146,44 @@ License: GPL-2+
 Files: module/splat/splat-linux.c
 Copyright: Lawrence Livermore National Security, LLC.
 License: GPL-2+
+
+Files: scripts/kmodtool
+Copyright: 2003-2012 Ville Skyttä <ville.skytta@iki.fi>
+ Thorsten Leemhuis <fedora@leemhuis.info>
+ Nicolas Chauvet <kwizart@gmail.com>
+License: BSD-like
+ 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
+ Foundation; either version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along with
+ this package; if not, write to the Free Software Foundation, Inc., 51 Franklin
+ St, Fifth Floor, Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public License version 2
+ can be found in the file /usr/share/common-licenses/GPL-2.