[SCM] libbluray/master: Document asm

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 237f30e9586e149050a28afca90db323c31b8710
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Nov 4 19:35:56 2015 +0100

    Document asm

diff --git a/debian/copyright b/debian/copyright
index 88da67e..048e3ee 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,6 +19,33 @@ Files: contrib/libudfread/src/*
 Copyright: 2014-2015 VLC authors and VideoLAN
 License: LGPL-2.1+
 
+Files: contrib/asm/*
+Copyright: 2000-2011 INRIA, France Telecom
+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 the copyright holders 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 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: jni/*
 Copyright: 1993-1996 Netscape Communications Corporation and Sun Microsystems, Inc.
 License: MPL-1.0 or GPL-2+ or LGPL-2.1+

-- 
libbluray packaging