[SCM] mplayer/master.experimental: Identify some files as LGPL, BSD-2 and Expat.

Wed Jul 15 15:29:21 UTC 2015

The following commit has been merged in the master.experimental branch:
commit e69eec2ed92140108b16451081ec0b91716608e8
Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
Date:   Wed Jul 15 11:26:20 2015 -0400

    Identify some files as LGPL, BSD-2 and Expat.

diff --git a/debian/copyright b/debian/copyright
index 3bd8ded..9844c1e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -38,6 +38,7 @@ Copyright:
  1995-1996 Alexandre Julliard
  1996-1998 Marcus Meissner
  1996 Martin von Loewis
+ 1999 Bertho A. Stultiens
  2000-2001 Eugene Kuznetsov  (divx at euro.ru)
 License: GPL-2+
 Comment: avifile DLL loader, Version 0.47 + patches + CVS updates, cf. http://avifile.sourceforge.net/
@@ -84,14 +85,6 @@ License: GPL-2+
 Comment: FreeSDP, Version 0.4.1, cf. https://savannah.nongnu.org/projects/freesdp/
 
 Files:
- libmpdemux/demux_avs.c
- libmpdemux/demux_avs.h
-Copyright:
- 2005 Gianluigi Tiesi <sherpya at netfarm.it>
- 2003 Kevin Atkinson
-License: GPL-2+
-
-Files:
  libmpdemux/yuv4mpeg.c
  libmpdemux/yuv4mpeg.h
  libmpdemux/yuv4mpeg_intern.h
@@ -196,6 +189,8 @@ License: LGPL-2.1+
 Comment: http://www.ffmpeg.org
 
 Files:
+ libmpdemux/demux_avs.c
+ libmpdemux/demux_avs.h
  libmpdemux/demux_rawdv.c
  libvo/vo_dfbmga.c
  libvo/vo_directfb2.c
@@ -205,8 +200,26 @@ Copyright:
  2002 Jiri Svoboda <Jiri.Svoboda at seznam.cz>
  2002 Alexander Neundorf <neundorf at kde.org>
  2002-2008 Ville Syrjala <syrjala at sci.fi>
+ 2003 Kevin Atkinson
+ 2005 Gianluigi Tiesi <sherpya at netfarm.it>
 License: LGPL-2.1+
 
+Files:
+ libmpdemux/demux_xmms_plugin.h
+Copyright:
+ 1998-2000 Peter Alm
+ 1998-2000 Mikael Alm
+ 1998-2000 Olle Hallnas
+ 1998-2000 Thomas Nilsson
+ 1998-2000 4Front Technologies
+License: BSD-2-Clause
+
+Files:
+ osdep/timer-darwin.c
+Copyright:
+ 2003-2004 Dan Villiom Podlaski Christiansen
+License: Expat
+
 Files: libass/*
 Copyright:
  2006 Evgeniy Stepanov <eugeni.stepanov at gmail.com>
@@ -284,3 +297,44 @@ License: other-1
  makes no representations about the suitability of this
  software for any purpose.  It is provided "as is" without
  express or implied warranty.
+
+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 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 OWNER 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.
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy of
+ this software and associated documentation files (the "Software"), to deal in
+ the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ of the Software, and to permit persons to whom the Software is furnished to do
+ so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ 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 AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.

-- 
mplayer packaging

