[SCM] libmediainfo/master: Update copyright file to include aes-gladman bits

hyperair at users.alioth.debian.org hyperair at users.alioth.debian.org
Fri Sep 19 03:33:46 UTC 2014


The following commit has been merged in the master branch:
commit 3253f5d7e681ab429f267eaa90ad73b4abf39070
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Thu Sep 18 19:01:26 2014 +0800

    Update copyright file to include aes-gladman bits

diff --git a/debian/copyright b/debian/copyright
index 0cecb3a..26a5e9f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,6 +17,10 @@ Files: Source/ThirdParty/tinyxml2/tinyxml2.cpp
 Copyright: Copyright: 2011-2012 Lee Thomason <leethomason at gmail.com>
 License: Zlib
 
+Files: Source/ThirdParty/aes-gladman/*
+Copyright: 1998-2013, Brian Gladman
+License: aes-gladman
+
 Files: debian/*
 Copyright: 2008, MediaArea.net SARL <Info at MediaArea.net>
            2012, Chow Loong Jin <hyperair at debian.org>
@@ -58,3 +62,17 @@ License: BSD-2-clause
  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: aes-gladman
+ The redistribution and use of this software (with or without changes)
+ is allowed without the payment of fees or royalties provided that:
+ .
+   source code distributions include the above copyright notice, this
+   list of conditions and the following disclaimer;
+ .
+   binary distributions include the above copyright notice, this list
+   of conditions and the following disclaimer in their documentation.
+ .
+ This software is provided 'as is' with no explicit or implied warranties
+ in respect of its operation, including, but not limited to, correctness
+ and fitness for purpose.

-- 
libmediainfo packaging



More information about the pkg-multimedia-commits mailing list