[SCM] gmerlin/master: Removed license info for stripped doc/ folder

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2216f97738f2f352820550d7bd64f8418a787f08
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Wed Jul 2 14:26:19 2014 +0200

    Removed license info for stripped doc/ folder
    
    Since the doc/ folder has been stripped for DFSG-reasons,
    we can strip the section in debian/copyright
    (rather than adding a lintian-override, as lintian triggers a
    false positive)

diff --git a/debian/copyright b/debian/copyright
index 4345cf3..5ed649a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -38,10 +38,6 @@ Copyright:
  1995-2006, Free Software Foundation, Inc
 License: GPL-2+
 
-Files: doc/*
-Copyright: 2001-2010, Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
-License: GFDL-1.1
-
 Files: config.rpath
  m4/*.m4
 Copyright: 1995-2006, Free Software Foundation, Inc
@@ -130,21 +126,6 @@ Comment:
  You should have received a copy of the GNU Lesser General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-License: GFDL-1.1
- Permission is granted to copy, distribute and/or modify this document
- under the terms of the GNU Free Documentation License, Version 1.1 or
- any later version published by the Free Software Foundation; with no
- Invariant Sections, with the Front-Cover Texts being “A GNU Manual,”
- and with the Back-Cover Texts as in (a) below. A copy of the license
- is included in the section entitled “GNU Free Documentation License.”
- .
- (a) The FSF's Back-Cover Text is: “You have freedom to copy and modify
- this GNU Manual, like GNU software. Copies published by the Free Software
- Foundation raise funds for GNU development.”
- .
- As mentioned in the license, there is no invariant section, hence following
- the requirements mentioned here: http://www.debian.org/vote/2006/vote_001
-
 License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions

-- 
gmerlin packaging