[SCM] gmerlin-avdecoder/master: Update copyright file: Include verbatim licensing statements, also of derived licenses.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5aef5b97a738a10d6223e9043e46431ea1bbfb68
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Mar 25 18:49:31 2012 +0200

    Update copyright file: Include verbatim licensing statements, also of derived licenses.

diff --git a/debian/copyright b/debian/copyright
index defa4cf..94197c8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,6 +11,16 @@ Copyright: 1995-2001,2004-2006, Free Software Foundation, Inc.
   2003-2009, Burkhard Plaum <plaum at ipf.uni-stuttgart.de>
 License: GPL-2+
 
+Files: */Makefile.in
+Copyright: 1994-2009, Free Software Foundation, Inc.
+Copyright: GAP~Makefile.in
+
+Files: include/asmrp.h
+ lib/asmrp.c
+ lib/pnm.[ch]
+Copyright: 2000-2002, the xine project
+License: GPL-2+~xine
+
 Files: config.rpath
  m4/*.m4
 Copyright: 1995-2006, Free Software Foundation, Inc
@@ -60,8 +70,17 @@ Comment:
  .
  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: GPL-2+~xine
+ xine 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.
  .
- Some files differ from above by replacing "This program" with "xine".
+ xine 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.
 
 License: LGPL-2.1+
  This header is free software; you can redistribute it and/or modify it
@@ -126,9 +145,16 @@ License: GAP
  WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  PURPOSE.
+
+Copyright: GAP~Makefile.in
+ This Makefile.in is free software; the Free Software Foundation gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
  .
- Some files differ from above by replacing "This file" with "This
- Makefile.in".
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
 
 License: GAP~gettext
  This file may be copied and used freely without restrictions.  It may

-- 
gmerlin-avdecoder packaging