[Pkg-voip-commits] [asterisk] 25/34: Update copyright info: Fix use License shortnames BSD-3-clause~IETF BSD-4-clause~Clapper (not BSD-3-clause). Fix include full verbatim BSD-3-clause~IETF license. Wrap at 72 chars.

Sun Mar 20 18:39:23 UTC 2016

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

js pushed a commit to branch master
in repository asterisk.

commit 6b8f5cc9e8fac414a06c5ba5bfff81c1b830aeea
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Mar 20 13:01:51 2016 +0100

    Update copyright info: Fix use License shortnames BSD-3-clause~IETF BSD-4-clause~Clapper (not BSD-3-clause). Fix include full verbatim BSD-3-clause~IETF license. Wrap at 72 chars.
---
 debian/copyright | 96 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 50 insertions(+), 46 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index c3ffb30..0c8ce1b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -308,34 +308,34 @@ Comment:
 
 Files: main/sha1.c include/asterisk/sha1.h
 Copyright: 2011 IETF Trust and the persons identified as authors of the code.
-License: BSD-3-clause
- - Redistributions of source code must retain the above
-   copyright notice, this list of conditions and
-   the following disclaimer.
- .
- - 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.
- .
- - Neither the name of Internet Society, IETF or IETF Trust, nor
-   the names of specific contributors, may be used to endorse or
-   promote products derived from this software without specific
-   prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- CONTRIBUTORS "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 OWNER OR
- CONTRIBUTORS 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-clause~IETF
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+  - Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ .
+  - 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.
+ .
+  - Neither the name of Internet Society, IETF or IETF Trust, nor the
+    names of specific contributors, may be used to endorse or promote
+    products derived from this software without specific prior written
+    permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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
+ OWNER OR CONTRIBUTORS 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.
 
 Files: addons/mp3/*
 Copyright: 1995,1996,1997 by Michael Hipp
@@ -585,24 +585,28 @@ License: public-domain
 
 Files: main/poll.c
 Copyright: 1995-2002, Brian M. Clapper
-License: BSD-3-clause
- Redistribution and use in source and binary forms are
- permitted provided that: (1) source distributions retain
- this entire copyright notice and comment; (2) modifications
- made to the software are prominently mentioned, and a copy
- of the original software (or a pointer to its location) are
- included; and (3) distributions including binaries display
- the following acknowledgement: "This product includes
- software developed by Brian M. Clapper <bmc at clapper.org>"
- in the documentation or other materials provided with the
- distribution. The name of the author may not be used to
- endorse or promote products derived from this software
- without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS
- OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- PARTICULAR PURPOSE.
+License: BSD-4-clause~Clapper
+ Redistribution and use in source and binary forms are permitted
+ provided that:
+ .
+  (1) source distributions retain this entire copyright notice and
+      comment;
+ .
+  (2) modifications made to the software are prominently mentioned, and
+      a copy of the original software (or a pointer to its location) are
+      included; and
+ .
+  (3) distributions including binaries display the following
+      acknowledgement: "This product includes software developed by
+      Brian M. Clapper <bmc at clapper.org>" in the documentation or other
+      materials provided with the distribution.
+ .
+ The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
 Files: include/jitterbuf.h
 Copyright: 2004-2005, Horizon Wimba, Inc

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

