[SCM] mplayer2/master: document license of mplayer/talloc.*, clarify that distribution is GPL-3+

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9e8d047d110c9716fbc01ba0f4f1c88e8d611b3c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Apr 22 07:38:01 2011 +0200

    document license of mplayer/talloc.*, clarify that distribution is GPL-3+

diff --git a/debian/copyright b/debian/copyright
index c7a07fa..b17e7d4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,7 @@ Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
 Upstream-Name: mplayer2
 Upstream-Contact: The mplayer and mplayer2 Developers <mplayer2-dev at mplayer2.org>
 Source: http://mplayer2.org
+Copyright: GPL-3+
 
 Files: *
 Copyright:
@@ -10,6 +11,12 @@ Copyright:
  2006 Zuxy MENG <zuxy.meng at gmail.com>
 License: GPL-2+
 
+Files: mplayer/talloc.*
+Copyright:
+ 2004-2005 Andrew Tridgell
+ 2006 Stefan Metzmacher
+License: LGPL-3+
+
 Files: debian/*
 Copyright: 2011 Reinhard Tartler <siretart at tauware.de>
 License: GPL-2+
@@ -273,6 +280,20 @@ License: GPL-2+
  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: GPL-3+
+ This program 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 3 of the License, or
+ (at your option) any later version.
+ .
+ This program 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/>.
+
 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
@@ -288,6 +309,20 @@ License: LGPL-2.1+
  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: LGPL-3+
+ 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 3 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, see <http://www.gnu.org/licenses/>.
+
 License: Expat
  Permission is hereby granted, free of charge, to any person
  obtaining a copy of this software and associated documentation

-- 
mplayer2 packaging