[DRE-commits] [SCM] ruby-yajl.git branch, master, updated. upstream/0.8.3-8-g3f14fd6

[Praveen Arimbrathodiyil]

The following commit has been merged in the master branch:
commit 3f14fd68fac41c5f19a6487bd60a6023910197e5
Author: Praveen Arimbrathodiyil <pravi.a at gmail.com>
Date:   Thu Sep 1 11:14:52 2011 +0530

    update debian/copyright for ext/*

diff --git a/debian/copyright b/debian/copyright
index a0b8a36..9c79ddb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,6 +10,14 @@ Files: debian/*
 Copyright: 2011 Praveen Arimbrathodiyil <pravi.a at gmail.com>
 License: Expat
 
+Files: ext/yajl/*.{c,h}
+Copyright: 2010, Lloyd Hilaiel
+License: BSD-3-clause
+
+Files: ext/yajl/yajl_ext.{c,h}
+Copyright: HOLDERS BE / 2008-2011 Brian Lopez - http://github.com/brianmario
+License: Expat
+
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining
  a copy of this software and associated documentation files (the
@@ -29,3 +37,32 @@ License: Expat
  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: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ . 
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+ . 
+  2. 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.
+ . 
+  3. Neither the name of Lloyd Hilaiel nor the names of its
+     contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
+ . 
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.

-- 
ruby-yajl.git