[SCM] gmerlin/master: Update debian/copyright.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a8b28d00250b94d52fa113d206f5d4ada6f3b48a
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Jan 26 13:43:13 2012 +0100

    Update debian/copyright.

diff --git a/debian/copyright b/debian/copyright
index 846152e..0890c0f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=157
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=200
 Upstream-Name: gmerlin
 Upstream-Contact: Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
 Source: http://gmerlin.sourceforge.net/
@@ -6,15 +6,10 @@ Comment: The origin tarball was repacked to remove the include/gmerlin/bg_sem.h
  which was covered by BSD-4-clause license terms.
 
 Files: *
-Copyright: 2001-2011, Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
-License: GPL-3+
-
-Files:  m4/Makefile.am,
- m4/check_funcs.m4,
- m4/gavl_simd.m4,
- m4/gl.m4,
- m4/lqt_opt_cflags.m4,
-Copyright: 2001-2011, Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
+Copyright:
+ 2001-2011, Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
+ 2006, Burkhard Plaum
+ 1985-2009, Free Software Foundation, Inc
 License: GPL-3+
 
 Files: apps/*/*.[ch],
@@ -26,10 +21,6 @@ Files: apps/*/*.[ch],
 Copyright: 2001-2011, Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
 License: GPL-2+
 
-Files: osd/GmerlinOSD.pfb
-Copyright: 2006, Burkhard Plaum
-License: GPL-3+
-
 Files: doc/*
 Copyright: 2001-2010, Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
 License: GFDL-1.1
@@ -59,10 +50,6 @@ Files: include/md5.h,
 Copyright: 1995-2006, Free Software Foundation, Inc
 License: GPL-2+
 
-Files: doc/texinfo.tex
-Copyright: 1985-2009, Free Software Foundation, Inc
-License: GPL-3+
-
 Files: lib/uthread_sem.c
 Copyright: 2000, Jason Evans <jasone at freebsd.org>
 License: BSD-2-clause
@@ -138,16 +125,18 @@ License: LGPL-2.1+
  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.
-
+ .
+Comment:
  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
-Comment: On Debian systems, the complete text of the GNU Lesser General Public
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public
  License version 2.1 can be found in '/usr/share/common-licenses/LGPL-2.1'.
 
 License: GFDL-1.1

-- 
gmerlin packaging