[SCM] smplayer/master: Add licensing information on libmaia, split sources stanzas from License ones.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Wed Oct 9 11:07:47 UTC 2013


The following commit has been merged in the master branch:
commit 1eff330eac39d6759aa7c5704b8dcab88cbe257c
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Oct 9 11:52:06 2013 +0100

    Add licensing information on libmaia, split sources stanzas from License ones.

diff --git a/debian/copyright b/debian/copyright
index 56405ae..8abb1cb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -97,23 +97,10 @@ Files:
  src/findsubtitles/quazip/zip.h
 Copyright: 1998-2005, Gilles Vollant
 License: Zlib
- Condition of use and distribution are the same than zlib :
- .
- This software is provided 'as-is', without any express or implied
- warranty.  In no event will the authors be held liable for any damages
- arising from the use of this software.
- .
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
- .
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
+
+Files: src/findsubtitles/maia/
+Copyright: 2010 Sebastian Wiedenroth
+License: BSD-2-clause
 
 Files: src/findsubtitles/quazip/quazip*
 Copyright: 2005-2007, Sergey A. Tachenov
@@ -217,3 +204,47 @@ License: infozip
  Info-ZIP retains the right to use the names "Info-ZIP," "Zip," "UnZip,"
  "UnZipSFX," "WiZ," "Pocket UnZip," "Pocket Zip," and "MacZip" for its own source
  and binary releases.
+
+License: Zlib
+ Condition of use and distribution are the same than zlib :
+ .
+ This software is provided 'as-is', without any express or implied
+ warranty.  In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+License: BSD-2-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.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ .
+ The views and conclusions contained in the software and documentation are those of the
+ authors and should not be interpreted as representing official policies, either expressed
+ or implied, of the author.

-- 
smplayer packaging



More information about the pkg-multimedia-commits mailing list