[Pkg-nagios-changes] [pkg-icinga2] 05/15: Add yajl license

[Alexander Wirt]

This is an automated email from the git hooks/post-receive script.

formorer pushed a commit to branch master
in repository pkg-icinga2.

commit f0046248eb5068fa4ad1b309f533d35caff24da2
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu Nov 20 09:27:21 2014 +0100

    Add yajl license
---
 debian/copyright | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 93dbc10..7a5eff4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -50,10 +50,6 @@ License: GPL-2+
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
-Files: third-party/cJSON/*
-Copyright: 2009 Dave Gamble
-License: MIT
-
 Files: third-party/execvpe/*
 Copyright: 1991,92, 1995-99, 2002, 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
 License: LGPL-2.1+
@@ -247,3 +243,18 @@ License: MIT
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
 
+Files: third-party/yajl/*
+Copyright: 2007-2014 Lloyd Hilaiel <me at lloyd.io>
+License: ISC
+ Permission to use, copy, modify, and/or distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga2.git