[SCM] ffms2/master: Merge remote branch 'origin/ubuntu'

[siretart at users.alioth.debian.org]

Correct team's name.
update debian/changelog
document copyright for src/core/matroskaparser.*
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 303a55f6aaadc95116eb4f535ee371587bc6ce63
X-Git-Newrev: 557ce9d1523f81deff9bc2628c06bc08bffc0e02

The following commit has been merged in the master branch:
commit 99c17f3ea4524964e6a5ad97ce990b7ec4083f01
Merge: 303a55f6aaadc95116eb4f535ee371587bc6ce63 23bc1a442600edb6104441a4d5c18bbd832fffd4
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Nov 16 09:32:14 2010 +0100

    Merge remote branch 'origin/ubuntu'
    
    Conflicts:
    	debian/changelog

diff --combined debian/copyright
index 1708fd0,c72b1b9..a0cfd61
--- a/debian/copyright
+++ b/debian/copyright
@@@ -31,10 -31,35 +31,37 @@@ License: MI
      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>
 +Copyright:
 +    2009-2010, Rickard Närström <rickard.narstrom at gmail.com>
 +    2010, Reinhard Tartler <siretart at tauware.de>
  License:
      Copying and distribution of this package, with or without
      modification, are permitted in any medium without royalty

-- 
ffms2 packaging