[SCM] mplayer/master.experimental: Update copyright file.

micove-guest at users.alioth.debian.org micove-guest at users.alioth.debian.org
Tue Jul 14 20:36:57 UTC 2015 

The following commit has been merged in the master.experimental branch:
commit d41a004f2c20b97a7b380c6778380bf15fc6d779
Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
Date:   Tue Jul 14 16:17:21 2015 -0400

    Update copyright file.
    
     - Update Format line
     - Update upstream name
     - Use 2000-2015 MPlayer Team as shown in the command line output
     - Fix ~40 instances of
         I: mplayer source: wildcard-matches-nothing-in-dep5-copyright
     - Fix
         I: mplayer source: unused-license-paragraph-in-dep5-copyright tremor
         I: mplayer source: unused-license-paragraph-in-dep5-copyright expat
     - Move the unconverted section to the end of the file for now so lintian can
       parse it.
     - Add ffmpeg/libavutil/x86/asm.h

diff --git a/debian/copyright b/debian/copyright
index 9aecc54..2bc562a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,11 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
-Upstream-Name: mplayer
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: MPlayer
 Source: http://mplayerhq.hu
 Copyright: GPL-2+
 
 Files: *
 Copyright:
- 2000-2011 The mplayer and mplayer2 Developers
+ 2000-2015 MPlayer Team
  1995-1999 by Michael Hipp
  2006 Zuxy MENG <zuxy.meng at gmail.com>
 License: GPL-2+
@@ -26,18 +26,6 @@ Copyright:
 License: GPL-2+
 Comment: Version 0.4.0b + patches, cf. http://libmpeg2.sourceforge.net/
 
-Files: mp3lib/*
-Copyright:
- 1995 by Michael Hipp
-License: GPL-2+
-Comment: Version: 0.59s + significant changes, cf. http://www.mpg123.de/
-
-Files: tremor/*
-Copyright:
- 2002 Xiph.org Foundation
-License: Tremor
-Comment: Version 1.0 + parts CVS from December 2004 + patches, cf. http://xiph.org/
-
 Files: loader/*
 Copyright:
  1995 Alexandre Julliard
@@ -81,232 +69,63 @@ Copyright:
 License: GPL-2+
 Comment: mjpeg.sourceforge.net
 
-Files: ffmpeg/*
+Files: ffmpeg/libavutil/x86/asm.h
 Copyright:
- 2010 Zhentan Feng <spyfeng at gmail dot com>
- 2010 Tomas Härdin
- 2010 Sebastian Vater <cdgs.basty at googlemail.com>
- 2010 Rafael Carre
- 2010 Nolan Lum <nol888 at gmail.com>
- 2010 Mohamed Naufal Basheer <naufal11 at gmail.com>
- 2010 Michele Orrù
- 2010 Michael Chinen
- 2010 Martin Storsjo
- 2010 Marcelo Galvao Povoa
- 2010 Laurent Aimar
- 2010 Josh Allmann
- 2010 Jason Garrett-Glaser <darkshikari at gmail.com>
- 2010 Janne Grunau <janne-ffmpeg at jannau.net>
- 2010, Google, Inc
- 2010 Francesco Lavra <francescolavra at interfree.it>
- 2010 Eli Friedman
- 2010 Daniel G. Taylor <dan at programmer-art.org>
- 2010 Carl Eugen Hoyos
- 2010 Anton Khirnov
- 2010 Anatoly Nenashev
- 2010 Amanda, Y.N. Wu <amanda11192003 at gmail.com>
- 2010 Alex Converse <alex.converse at gmail.com>
- 2010 Adrian Daerr and Nicolas George
- 2009 Tobias Bindhammer
- 2009 Thomas P. Higdon <thomas.p.higdon at gmail.com>
- 2009 Thilo Borgmann <thilo.borgmann _at_ googlemail.com>
- 2009 Stephen Backway
- 2009 Samalyse
- 2009 Ronald S. Bultje <rsbultje at gmail.com>
- 2009 Nathan Caldwell <saintdev (at) gmail.com>
- 2009 Michael Tison
- 2009 Maxim Poliakovski
- 2009 Kostya Shishkov
- 2009 Kenan Gillet
- 2009 Kenan Gillet
- 2009 Jimmy Christensen
- 2009 James Darnley
- 2009 Ivan Schreter
- 2009 Dylan Yudaken
- 2009 Daniel Verkamp <daniel at drv.nu>
- 2009 Colin McQuillan
- 2009 Christian Schmidt
- 2009 Bjorn Axelsson
- 2009-2010 Stefano Sabatini
- 2008 vmrsss
- 2008 Vladimir Voroshilov
- 2008 Victor Paesa
- 2008 Sisir Koppaka
- 2008 Robert Marston
- 2008 NVIDIA
- 2008 Jaikrishnan Menon <realityman at gmx.net>
- 2008 Jaikrishnan Menon <realityman at gmx.net>
- 2008 GUCAS, Zhentan Feng <spyfeng at gmail dot com>
- 2008 Alessandro Sappia
- 2008 Affine Systems, Inc (Michael Sullivan, Bobby Impollonia)
- 2008-2010 Vitor Sessak
- 2008-2010 Paul Kendall <paul at kcbbs.gen.nz>
- 2008-2010 David Conrad
- 2008-2010 Alexander Strange <astrange at ithinksw.com>
- 2008-2009 Splitted-Desktop Systems
- 2007 Nicholas Tung
- 2007 Marco Gerards <marco at gnu.org>
- 2007 Marc Hoffman <marc.hoffman at analog.com>
- 2007 Luca Barbato <lu_zero at gentoo.org>
- 2007 Denes Balatoni <dbalatoni at programozo.hu>
- 2007 Bobby Bingham
- 2007 Bj<F6>rn Axelsson
- 2007 Benoit Fouet ( benoit fouet free fr )
- 2007 Anssi Hannula <anssi.hannula at gmail.com>
- 2007-2010 Baptiste Coudurier <baptiste dot coudurier at smartjog dot com>
- 2007-2009 Loren Merritt <lorenm at u.washignton.edu>
- 2007-2009 Bartlomiej Wolowiec <bartek.wolowiec at gmail.com>
- 2007-2008 Siarhei Siamashka <ssvb at users.sourceforge.net>
- 2007-2008 Ian Caulfield
- 2006 Thijs Vermeir <thijs.vermeir at barco.com>
- 2006 Steve Lhomme
- 2006 Stefan Gehrer <stefan.gehrer at gmx.de>
- 2006 Paul Richards <paul.richards at gmail.com>
- 2006 Patrick Guimond
- 2006 Kartikey Mahendra BHATT (bhattkm at gmail dot com)
- 2006 Julian Hall
- 2006 Guillaume Poirier <gpoirier at mplayerhq.hu>
- 2006 Expertisecentrum Digitale Media, UHasselt
- 2006 Daniel Maas <dmaas at maasdigital.com>
- 2006 Corey Hickey
- 2006 Benjamin Larsson
- 2006-2010 Reimar Döffinger <Reimar.Doeffinger at gmx.de>
- 2006-2010 Prakash Punnoor <prakash at punnoor.de>
- 2006-2010 Justin Ruggles <justin.ruggles at gmail.com>
- 2006-2010 Aurelien Jacobs <aurel at gnuage.org>
- 2006-2009 Robert Swain ( rob opendot cl )
- 2006-2009 Ramiro Polla <ramiro at lisha.ufsc.br>
- 2006-2009 Baptiste Coudurier
- 2006-2008 Zuxy MENG Jie, Loren Merritt
- 2006-2008 Ivo van Poorten
- 2006-2008 Gregory Montoir (cyx at users.sourceforge.net)
- 2006-2008 BBC, Anuradha Suraparaju <asuraparaju at gmail dot com >
- 2006-2007 SmartJog S.A., Baptiste Coudurier <baptiste dot coudurier at smartjog dot com>
- 2006-2007 Ryan Martell <rdm4 at martellventures.com>
- 2006-2007 Reynaldo H. Verdejo Pinochet
- 2006, 2007 Michel Bardiaux <mbardiaux at mediaxim.be>
- 2006-2007 Maxim Gavrilov ( maxim.gavrilov gmail com )
- 2006-2007 Luca Abeni ( lucabe72 email it )
- 2005 Vidar Madsen
- 2005 Steve Underwood <steveu at coppice.org>
- 2005 Ole Andr<E9> Vadla Ravn<E5>s <oleavr at gmail.com>
- 2005 Matthieu CASTET, Alex Beregszaszi
- 2005 Luca Barbato <lu_zero at gentoo.org>
- 2005 Jeff Muizelaar
- 2005 BBC, Andrew Kennedy <dirac at rd dot bbc dot co dot uk>
- 2005 Anonymous, Alex Beregszaszi, Michael Niedermayer
- 2005 Alban Bedel <albeu at free.fr>
- 2005-2010 Mans Rullgard <mans at mansr.com>
- 2005-2008 Konstantin Shishkov
- 2005-2007 Wolfram Gloger
- 2005-2006 Robert Edele <yartrebo at earthlink.net>
- 2005-2006 Oded Shimon <ods15 at ods15.dyndns.org>
- 2005-2006 DivX, Inc
- 2004 Maarten Daniels
- 2004 Gildas Bazin <gbazin at videolan dot org>
- 2004 AGAWA Koji
- 2004 Adam Thayer <krevnik at comcast.net>
- 2004-2007 Eric Lasota
- 2004-2007 Denes Balatoni < dbalatoni XatX interware XdotX hu >
- 2004-2007 Benjamin Zores
- 2004-2005 Michael Niedermayer, Loren Merritt
- 2003 Tinic Uro
- 2003 Thomas Raivio
- 2003 Sascha Sommer
- 2003 Pascal Massimino <skal at planet-d.net>
- 2003 Nick Kurshev
- 2003 Michel Bardiaux
- 2003 Max Krasnyansky <maxk at qualcomm.com>
- 2003 James Klicman <james at klicman.org>
- 2003 Ivan Kalvachev
- 2003 Dr. Tim Ferguson
- 2003 David S. Miller <davem at redhat.com>
- 2003 Daniel Moreno <comac AT comac DOT darktech DOT org>
- 2003, 2007 Mike Melanson
- 2003-2004 Roman Shaposhnik
- 2003-2004 Romain Dolbeau <romain at dolbeau.org>
- 2002 the xine project
- 2002 Steve O'Hara-Smith
- 2002 Remi Guyomarch <rguyom at pobox.com>]
- 2002 Laszlo Torok <torokl at alpha.dfmk.hu>
- 2002 Francois Revol
- 2002 Falk Hueffner <falk at debian.org>
- 2002 Dieter Shirley
- 2002 by Leon van Stuivenberg
- 2002 Brian Foley
- 2002 A'rpi
- 2002-2009 Maxim Poliakovski
- 2002-2007 the ffmpeg project
- 2002-2006 Alex Beregszaszi
- 2002-2004 Roberto Togni
- 2002-2003 Brian J. Murrell
- 2001 Tim Ferguson
- 2001 Lionel Ulmer
- 2001 Juan J. Sierralta P
- 2001-2010 Michael Niedermayer <michaelni at gmx.at>
- 2001, 2006-2010 Peter Ross <pross at xvid.org>
- 2001-2003 BERO <bero at geocities.co.jp>
- 2000 Michel Lespinasse <walken at zoy.org>
- 2000-2011 The FFmpeg developers
- 2000-2003 Fabrice Bellard
- 2000-2001 Peter Gubanov <peter at elecard.net.ru>
- 2000-2001 Michel Lespinasse <walken at zoy.org>
- 1999 Roger Hardiman
- 1999 Intel Corporation
- 1999,2000 Sebastien Rougeaux <sebastien.rougeaux at anu.edu.au>
- 1994-1996, Thomas G. Lane
+ 2006 Michael Niedermayer <michaelni at gmx.at>
 License: LGPL-2.1+
 
-Files: ffmpeg/ffmpeg.c
- ffmpeg/libavcodec/dtsdec.c
- ffmpeg/libavcodec/i386/idct_mmx.c
- ffmpeg/libavcodec/liba52/*.[ch]
- ffmpeg/libavformat/x11grab.c
- ffmpeg/libavformat/gxfenc.c
- ffmpeg/libpostproc/postprocess_internal.h
- ffmpeg/libpostproc/postprocess_altivec_template.c
- ffmpeg/libpostproc/postprocess.h
- ffmpeg/libpostproc/postprocess_template.c
- ffmpeg/libpostproc/postprocess.c
- ffmpeg/libpostproc/mangle.h
- ffmpeg/libswscale/swscale.c
- ffmpeg/libswscale/swscale-example.c
- ffmpeg/libswscale/yuv2rgb_template.c
- ffmpeg/libswscale/swscale_altivec_template.c
- ffmpeg/libswscale/yuv2rgb_altivec.c
- ffmpeg/libswscale/swscale_template.c
- ffmpeg/libswscale/rgb2rgb_template.c
- ffmpeg/libswscale/rgb2rgb.c
- ffmpeg/libswscale/cs_test.c
- ffmpeg/libswscale/yuv2rgb_mlib.c
- ffmpeg/libswscale/yuv2rgb.c
+Files: libass/*
 Copyright:
- 2000-2011 The FFmpeg developers
- 2006 Clemens Fruhwirth <clemens at endorphin.org>
- 1999-2001 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
- 2000-2001 Fabrice Bellard
- 1997-1998 Rasca, Berlin
-License: GPL-2+
+ 2009-2010 Grigori Goronzy <greg at geekmind.org>
+ 2006 Evgeniy Stepanov <eugeni.stepanov at gmail.com>
+ 1988-1993 The Regents of the University of California.
+ 1994 Sun Microsystems, Inc.
+License: ISC
 
-Files: ffmpeg/libavcodec/x86/vc1dsp_mmx.c
- ffmpeg/libavcodec/nellymoser.*
- ffmpeg/libavcodec/nellymoserdec.c
- ffmpeg/libavformat/oggdec.*
- ffmpeg/libavformat/oggparseogm.c
- ffmpeg/libavformat/oggparsevorbis.c
-Copyright:
- 2007 Christophe GISQUET <christophe.gisquet at free.fr>
- 2007 Loic Minier <lool at dooz.org>, Benjamin Larsson
- 2005 Michael Ahlberg, Måns Rullgård
-License: Expat
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
-Files:
- mplayer/ffmpeg_files/arm/bswap.h
- mplayer/ffmpeg_files/sh4/bswap.h
- mplayer/ffmpeg_files/taglists.c
- mplayer/ffmpeg_files/bswap.h
- mplayer/ffmpeg_files/bfin/bswap.h
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
+License: ISC
+ Permission to use, copy, modify, and/or distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 The following has not been converted fully to dep5 yet.
 
@@ -863,110 +682,3 @@ Access files on this server with:
 Note that paths which do not start with a / will be interpreted as relative to
 the directory where the server is running. The '-cache' option is not needed
 but highly recommended.
- mplayer/ffmpeg_files/taglists.h
- mplayer/ffmpeg_files/x86/bswap.h
- mplayer/ffmpeg_files/x86_cpu.h
-Copyright:
- 2004 Romain Dolbeau <romain at dolbeau.org>
- 2000-2011 The FFmpeg developers
- 1995-1999 by Michael Hipp
-License: LGPL-2.1+
-
-Files: libass/*
-Copyright:
- 2009-2010 Grigori Goronzy <greg at geekmind.org>
- 2006 Evgeniy Stepanov <eugeni.stepanov at gmail.com>
- 1988-1993 The Regents of the University of California.
- 1994 Sun Microsystems, Inc.
-License: ISC
-
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-License: LGPL-2.1+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-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.
-
-License: ISC
- Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
- .
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-License: Tremor
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- - 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.
- - Neither the name of the Xiph.org Foundation nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
- 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 FOUNDATION
- 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.

-- 
mplayer packaging

More information about the pkg-multimedia-commits mailing list