[SCM] libopenshot/master: Update copyright information

ghisvail-guest at users.alioth.debian.org ghisvail-guest at users.alioth.debian.org
Tue Jun 13 10:55:28 UTC 2017


The following commit has been merged in the master branch:
commit 783a333c3e48a547db89d8781acb997d0c69b6ba
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Jun 13 11:10:50 2017 +0100

    Update copyright information
    
    Gbp-Dch: Short
    Thanks: Chris Lamb
    Closes: #855347

diff --git a/debian/copyright b/debian/copyright
index 1b53373..d8b2892 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,17 +13,32 @@ License: LGPL-3+
 
 Files: cmake/Modules/FindPythonLibs.cmake
 Copyright: 2001-2009 Kitware, Inc.
-License: BSD-3-clause
+License: BSD-3-Clause
 
 Files: cmake/Modules/UseDoxygen.cmake
 Copyright: 2009-2011 Tobias Rautenkranz <tobias at rautenkranz.ch>
-License: BSD-3-clause
+License: BSD-3-Clause
 
 Files: debian/*
 Copyright: 2016 Ghislain Antony Vaillant <ghisvail at gmail.com>
 License: LGPL-3+
 
-License: BSD-3-clause
+Files: include/FFmpegReader.h
+ include/FFmpegWriter.h
+ include/ImageWriter.h
+ src/FFmpegReader.cpp
+ src/FFmpegWriter.cpp
+Copyright: 2008-2013 OpenShot Studios, LLC, Fabrice Bellard
+License: LGPL-3+
+
+Files: src/DecklinkInput.cpp
+ src/DecklinkOutput.cpp
+Copyright: 2009 Blackmagic Design
+License: BSL-1.0 or LGPL-3+
+
+License: BSD-3-Clause
+ BSD 3-Clause License
+ .
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
  .
@@ -49,6 +64,31 @@ License: BSD-3-clause
  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: BSL-1.0
+ Boost Software License - Version 1.0 - August 17th, 2003
+ .
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by
+ this license (the "Software") to use, reproduce, display, distribute,
+ execute, and transmit the Software, and to prepare derivative works of the
+ Software, and to permit third-parties to whom the Software is furnished to
+ do so, all subject to the following:
+ .
+ The copyright notices in the Software and this entire statement, including
+ the above license grant, this restriction and the following disclaimer,
+ must be included in all copies of the Software, in whole or in part, and
+ all derivative works of the Software, unless such copies or derivative
+ works are solely in the form of machine-executable object code generated by
+ a source language processor.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
 License: LGPL-3+
  This program is free software; you can redistribute it and/or modify it
  under the terms of the GNU Lesser General Public License as published by the

-- 
libopenshot packaging



More information about the pkg-multimedia-commits mailing list