[SCM] ffms2/ubuntu: document copyright for src/core/matroskaparser.*

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sat Nov 6 10:06:23 UTC 2010


The following commit has been merged in the ubuntu branch:
commit f906201e0c8afafbf0e2b2ca187e42d704a0bd24
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Nov 6 09:39:59 2010 +0100

    document copyright for src/core/matroskaparser.*

diff --git a/debian/copyright b/debian/copyright
index dfcc0a9..c72b1b9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -31,6 +31,33 @@ License: MIT
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
     THE SOFTWARE.
 
+Files: src/core/matroskaparser.*
+Copyright: 2004-2009 Mike Matsnev
+License:
+    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 immediately at the beginning of the file, without modification,
+       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. Absolutely no warranty of function or purpose is made by the author
+       Mike Matsnev.
+    .
+    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 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: debian/*
 Copyright: 2009-2010, Rickard Närström <rickard.narstrom at gmail.com>
 License:

-- 
ffms2 packaging



More information about the pkg-multimedia-commits mailing list