[SCM] mplayer2/master: Fix mplayer/* files.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Wed Mar 23 18:28:18 UTC 2011


The following commit has been merged in the master branch:
commit 14043e148cbf663fb21252f48ba2ffb5ee9c4515
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Mar 23 19:28:09 2011 +0100

    Fix mplayer/* files.

diff --git a/debian/copyright b/debian/copyright
index 1eb5ed5..e8ba6dc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,10 @@ Upstream-Contact: The mplayer and mplayer2 Developers <mplayer2-dev at mplayer2.org
 Source: http://mplayer2.org
 
 Files: *
-Copyright: 2000-2011 The mplayer and mplayer2 Developers
+Copyright:
+ 2000-2011 The mplayer and mplayer2 Developers
+ 1995-1999 by Michael Hipp
+ 2006 Zuxy MENG <zuxy.meng at gmail.com>
 License: GPL-2+
 
 Files: debian/*
@@ -239,9 +242,20 @@ Files:
  mplayer/ffmpeg_files/taglists.h
  mplayer/ffmpeg_files/x86/bswap.h
  mplayer/ffmpeg_files/x86_cpu.h
-Copyright: 2000-2011 The FFmpeg developers
+ mplayer/mp3libs/layer1.c
+ mplayer/mp3lib/dct64_altivec.c
+Copyright:
+ 2004 Romain Dolbeau <romain at dolbeau.org>
+ 2000-2011 The FFmpeg developers
+ 1995-1999 by Michael Hipp
 License: LGPL-2.1+
 
+Files: mplayer/mp3libs/dct36.c
+Copyright: Copyright 1997 Mikko Tommila
+License: other
+ This piece of code is Copyright 1997 Mikko Tommila and is freely usable
+ by anybody. The algorithm itself is of course in the public domain.
+
 Files: libass/*
 Copyright:
  2009-2010 Grigori Goronzy <greg at geekmind.org>
@@ -250,7 +264,7 @@ Copyright:
  1994 Sun Microsystems, Inc.
 License: ISC
 
-License: GPL-2.0+
+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

-- 
mplayer2 packaging



More information about the pkg-multimedia-commits mailing list