[SCM] vlc/master: debian/ and some cleanup

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b539aa3b455377e3615009f3074c6e504b36acc8
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Fri Dec 1 02:04:23 2017 +0100

    debian/ and some cleanup

diff --git a/debian/copyright b/debian/copyright
index a8e64f1..a417607 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -917,10 +917,12 @@ Copyright: 2003, ANEVIA
 License: LGPL-2.1+
 
 Files: debian/*
-License: GPL-2+ or LGPL-2.1+
-Comment: No explicit license found, using license(s) from:
- COPYING
- COPYING.LIB
+Copyright: 2010-2015, Benjamin Drung
+           2009-2011, Christophe Mutricy
+           2006-2014, Reinhard Tartler
+           2006-2007, Sam Hocevar
+           2013-2017, Sebastian Ramacher
+License: GPL-2+
 
 Files: modules/audio_output/TPCircularBuffer.*
 Copyright: 2011-2012, A Tasty Pixel
@@ -1038,8 +1040,7 @@ Copyright: 2012, Broadcom Europe Ltd
            2009, Steve Audette
 License: BSD-3-clause
 
-Files: autotools/install-sh
-       modules/codec/omxil/OMX_Audio.h
+Files: modules/codec/omxil/OMX_Audio.h
        modules/codec/omxil/OMX_Component.h
        modules/codec/omxil/OMX_Core.h
        modules/codec/omxil/OMX_IVCommon.h
@@ -1057,7 +1058,6 @@ Copyright: 2007-2009, Ariya Hidayat <ariya at kde.org>
            2015, Moti Zilberman
            Qxt Foundation
            2008, The Khronos Group Inc
-           1994, X Consortium
 License: Expat
 
 Files: modules/codec/wmafixed/wmafixed.c
@@ -1181,10 +1181,6 @@ Copyright: 2005, Christian Klein
            2006, Lincoln Ramsay
 License: BSD-2-clause or LGPL-2.1
 
-Files: autotools/ltmain.sh
-Copyright: 1996-2015, Free Software Foundation, Inc
-License: GPL-2+ with LibTool exception
-
 Files: compat/memrchr.c
 Copyright: 2007, Todd C. Miller <Todd.Miller at courtesan.com>
 License: ISC

-- 
VLC media player packaging