[SCM] obs-studio/master: Fix license info

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 002ffdc90f086a8a9387c3f6c4993ad47da0330e
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue May 24 22:50:56 2016 +0200

    Fix license info

diff --git a/debian/copyright b/debian/copyright
index f0ae4e4..dd38e90 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -28,12 +28,23 @@ Copyright:
  1999,2005 Pthreads-win32 contributors
  1998 Ben Elliston
  1998-2001 Ross Johnson
+License: LGPL-2+
+
+Files: deps/w32-pthreads/tests/cancel6a.c
+       deps/w32-pthreads/tests/cancel6d.c
+       deps/w32-pthreads/tests/mutex8.c
+       deps/w32-pthreads/tests/mutex8e.c
+       deps/w32-pthreads/tests/mutex8n.c
+       deps/w32-pthreads/tests/mutex8r.c
+Copyright:
+ 1998 Ben Elliston
+ 1998-2001 Ross Johnson
 License: LGPL-2.1+
 
 Files: deps/libff/*
 Copyright: 2014,2016 by Hugh Bailey <obs.jim at gmail.com>
            2015 John R. Bradley <jrb at turrettech.com>
-License: Expat
+License: ISC
 
 Files: plugins/text-freetype2/obs-convenience.c
        plugins/text-freetype2/text-freetype2.h
@@ -118,7 +129,7 @@ Files: libobs/data/deinterlace*.effect
 Copyright: 2015-2016 Ruwen Hahn <palana at stunned.de>
            2015-2016 John R. Bradley <jrb at turrettech.com>
            2015-2016 Hugh Bailey "Jim" <obs.jim at gmail.com>
-License: Expat
+License: ISC
 
 Files: plugins/obs-outputs/librtmp/*
 Copyright:
@@ -155,6 +166,14 @@ Files: plugins/linux-alsa/*
 Copyright: 2015 Guillermo A. Armaral B.
 License: GPL-2+
 
+Files: plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.*
+Copyright: 2015 Hugh Bailey <obs.jim at gmail.com>
+License: ISC
+
+Files: plugins/obs-ffmpeg/obs-ffmpeg-source.c
+Copyright: 2015 John R. Bradley <jrb at turrettech.com>
+License: ISC
+
 Files: debian/*
 Copyright:
  2015 Carl Fürstenberg <azatoth at gmail.com>
@@ -178,22 +197,22 @@ 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.0+
- 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.
+License: LGPL-2+
+ This package 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 2 of the License, or (at your option) any later version.
  .
  This package 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.
+ 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 General Public License
  along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in "/usr/share/common-licenses/LGPL-2".
 
 License: LGPL-2.1+
  This package is free software; you can redistribute it and/or

-- 
obs-studio packaging