[r-cran-httpuv] 01/01: add BSD-2 text

[Joost van Baal]

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

joostvb pushed a commit to branch master
in repository r-cran-httpuv.

commit 550765204e81da26d532db5117f8a93abe123189
Author: Joost van Baal-Ilić <joostvb at uvt.nl>
Date:   Fri Dec 18 15:56:07 2015 +0100

    add BSD-2 text
---
 debian/copyright | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 9440ed9..5034d8e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,17 +10,17 @@ License: GPL-3
 Files: src/libuv/*
 Copyright: Joyent, Inc. and other Node contributors.
 Comment: libuv is part of the Node project: http://nodejs.org/
-License: Node's license
+License: Node
 
 Files: src/libuv/include/uv-private/tree.h
 Copyright: Niels Provos
 Comment: from FreeBSD
-License: Two clause BSD license
+License: BSD-2
 
 Files: src/libuv/include/uv-private/ngx-queue.h
 Copyright: Igor Sysoev
 Comment: from Nginx
-Licenes: Two clause BSD license.
+License: BSD-2
 
 Files: src/libuv/src/inet.c
 Copyright: 2004 Internet Systems Consortium, Inc. ("ISC")
@@ -43,7 +43,7 @@ License: GPL-3
  On Debian systems, the full text of the GNU General Public License
  version 3 can be found in `/usr/share/common-licenses/GPL-3'.
 
-License: Node's license
+License: Node
  All rights reserved.
  .
  Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -77,6 +77,31 @@ License: ISC
  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
  OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+License: BSD-2
+ 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(s), this list of conditions and the following disclaimer as
+    the first lines of this file unmodified other than the possible
+    addition of one or more copyright notices.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice(s), this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
+
 License: BSD-3
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-httpuv.git