[SCM] mediaconch/master: Update debian/copyright with BSD-licensed files

hyperair at users.alioth.debian.org hyperair at users.alioth.debian.org
Mon Feb 8 14:53:39 UTC 2016


The following commit has been merged in the master branch:
commit 30a4e0586caa7f6e6fa677dd1c2b9d4fd6d5dff7
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Mon Feb 8 22:44:02 2016 +0800

    Update debian/copyright with BSD-licensed files

diff --git a/debian/copyright b/debian/copyright
index 3bd8e87..88b5ada 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -42,6 +42,10 @@ Files: Project/GNU/GUI/mediaconch-gui.appdata.xml
 Copyright: 2015 MediaArea.net <info at mediaarea.net>
 License: CC-BY-3.0
 
+Files: Release/*
+Copyright: 2015 Mediaarea.net <info at mediaarea.net>
+License: BSD-2-clause
+
 Files: debian/*
 Copyright: 2015, Chow Loong Jin <hyperair at debian.org>
 License: GPL-3+ or MPL-2+
@@ -726,3 +730,27 @@ License: CC-BY-3.0
      this trademark restriction does not form part of this License.
  .
      Creative Commons may be contacted at https://creativecommons.org/.
+
+License: BSD-2-clause
+ All rights reserved.
+ .
+ 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.
+ .
+ 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 HOLDER 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.

-- 
mediaconch packaging



More information about the pkg-multimedia-commits mailing list