[SCM] mplayer2/master: libavdevice is OK now, strip trailing .0 from GPL's version.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Wed Mar 23 17:30:34 UTC 2011


The following commit has been merged in the master branch:
commit 61383c5a37c04cc6fdb3df85287d21d696cb4b4b
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Mar 23 18:29:53 2011 +0100

    libavdevice is OK now, strip trailing .0 from GPL's version.

diff --git a/debian/copyright b/debian/copyright
index 6fc0352..44b18b0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,11 +5,11 @@ Source: http://mplayer2.org
 
 Files: *
 Copyright: 2000-2011 The mplayer and mplayer2 Developers
-License: GPL-2.0+
+License: GPL-2+
 
 Files: debian/*
 Copyright: 2011 Reinhard Tartler <siretart at tauware.de>
-License: GPL-2.0+
+License: GPL-2+
 
 Files: ffmpeg-mt/*
 Copyright:
@@ -32,6 +32,7 @@ Copyright:
  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 Maxim Poliakovski
@@ -49,6 +50,7 @@ Copyright:
  2008 Jaikrishnan Menon <realityman at gmx.net>
  2008 Gregory Montoir (cyx at users.sourceforge.net)
  2008 Alexander Strange (astrange at ithinksw.com)
+ 2008 Alessandro Sappia
  2008-2010 Vitor Sessak
  2008-2010 Paul Kendall <paul at kcbbs.gen.nz>
  2008-2009 Splitted-Desktop Systems
@@ -61,6 +63,7 @@ Copyright:
  2007 Marc Hoffman <marc.hoffman at analog.com>
  2007 Luca Barbato <lu_zero at gentoo.org>
  2007 Bobby Bingham
+ 2007 Benoit Fouet ( benoit fouet free fr )
  2007 Bartlomiej Wolowiec <bartek.wolowiec at gmail.com>
  2007 Baptiste Coudurier <baptiste dot coudurier at smartjog dot com>
  2007 Anssi Hannula <anssi.hannula at gmail.com>
@@ -70,16 +73,12 @@ Copyright:
  2007-2008 Ian Caulfield
  2006 Stefan Gehrer <stefan.gehrer at gmx.de>
  2006 Paul Richards <paul.richards at gmail.com>
- 2006-2007 Luca Abeni ( lucabe72 email it )
  2006 Kartikey Mahendra BHATT (bhattkm at gmail dot com)
  2006 Guillaume Poirier <gpoirier at mplayerhq.hu>
  2006 Expertisecentrum Digitale Media, UHasselt
  2006 Daniel Maas <dmaas at maasdigital.com>
  2006 Corey Hickey
- 2009 Samalyse
  2006 Benjamin Larsson
- 2003 Max Krasnyansky <maxk at qualcomm.com>
- 2007 Benoit Fouet ( benoit fouet free fr )
  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>
@@ -91,6 +90,7 @@ Copyright:
  2006-2008 BBC, Anuradha Suraparaju <asuraparaju at gmail dot com >
  2006, 2007 Michel Bardiaux <mbardiaux at mediaxim.be>
  2006-2007 Maxim Gavrilov ( maxim.gavrilov gmail com )
+ 2006-2007 Luca Abeni ( lucabe72 email it )
  2005 Wolfram Gloger
  2005 Steve Underwood <steveu at coppice.org>
  2005 Ole Andr<E9> Vadla Ravn<E5>s <oleavr at gmail.com>
@@ -114,6 +114,7 @@ Copyright:
  2003 Sascha Sommer
  2003 Pascal Massimino <skal at planet-d.net>
  2003 Nick Kurshev
+ 2003 Max Krasnyansky <maxk at qualcomm.com>
  2003 James Klicman <james at klicman.org>
  2003 Ivan Kalvachev
  2003 Dr. Tim Ferguson
@@ -123,6 +124,7 @@ Copyright:
  2003-2004 Romain Dolbeau <romain at dolbeau.org>
  2003-2004 Alex Beregszaszi
  2002 the xine project
+ 2002 Steve O'Hara-Smith
  2002 Laszlo Torok <torokl at alpha.dfmk.hu>
  2002 Francois Revol
  2002 Falk Hueffner <falk at debian.org>
@@ -144,7 +146,9 @@ Copyright:
  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
 License: LGPL-2.1+
 
@@ -173,8 +177,11 @@ Files: ffmpeg-mt/ffmpeg.c
  ffmpeg-mt/libswscale/yuv2rgb.c
 Copyright:
  2000-2011 The FFmpeg developers
+ 2006 Clemens Fruhwirth <clemens at endorphin.org>
  1999-2001 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
-License: GPL-2.0+
+ 2000-2001 Fabrice Bellard
+ 1997-1998 Rasca, Berlin
+License: GPL-2+
 
 Files: ffmpeg-mt/libavcodec/x86/vc1dsp_mmx.c
  ffmpeg-mt/libavcodec/nellymoser.*

-- 
mplayer2 packaging



More information about the pkg-multimedia-commits mailing list