Merge tag 'upstream/0.6.5.5'

[mirror_spl-debian.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 30614595720d5c079d7041d6ff0b0a583e0a0e3e..c0db13044c0a2e64dd1ef39225a48f08f8abac7c 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -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
@@ -147,6 +147,30 @@ 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