[SCM] obs-studio/master: Update with decopy
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Wed Apr 19 21:53:12 UTC 2017
The following commit has been merged in the master branch:
commit 0c3a1d73b6fb9e018dc46cf360a4e3e87ccd1dc9
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Wed Apr 19 23:53:00 2017 +0200
Update with decopy
diff --git a/debian/copyright b/debian/copyright
index 900a0f5..e89cb8a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,19 +11,42 @@ Files-Excluded:
plugins/obs-qsv11/*
Files: *
-Copyright: 2013-2016 by Hugh Bailey <obs.jim at gmail.com>
+Copyright: 2013-2016, Hugh Bailey <obs.jim at gmail.com>
License: GPL-2+
-Files: deps/glad/include/KHR/khrplatform.h
-Copyright: 2008-2009 The Khronos Group Inc
+Files: cmake/Modules/FindJack.cmake
+ cmake/Modules/FindThreads.cmake
+ cmake/Modules/FindX11_XCB.cmake
+ cmake/Modules/FindXCB.cmake
+ libobs/util/*
+Copyright: 2002-2014, Kitware, Inc
+ 2006, Alexander Chemeris
+ 2008, Andreas Schneider <mail at cynapses.org>
+ 2011, Fredrik Höglund <fredrik at kde.org>
+ 2008, Helio Chissini de Castro <helio at kde.org>
+ 2013, Martin Gräßlin <mgraesslin at kde.org>
+ 2007, Matthias Kretz <kretz at kde.org>
+License: BSD-3-clause
+
+Files: debian/*
+Copyright: 2015, Carl Fürstenberg <azatoth at gmail.com>
+ 2016-2017, Sebastian Ramacher <sramacher at debian.org>
+License: GPL-2+
+
+Files: deps/glad/include/KHR/*
+Copyright: 2008-2009, The Khronos Group Inc
License: Expat
+Files: deps/libff/*
+Copyright: 2014-2016, Hugh Bailey <obs.jim at gmail.com>
+ 2015, John R. Bradley <jrb at turrettech.com>
+License: ISC
+
Files: deps/w32-pthreads/*
-Copyright:
- 1998 John E. Bossom
- 1999,2005 Pthreads-win32 contributors
- 1998 Ben Elliston
- 1998-2001 Ross Johnson
+Copyright: 1998, Ben Elliston
+ 1998, John E. Bossom
+ 1999-2005, Pthreads-win32 contributors
+ 1998-2001, Ross Johnson
License: LGPL-2+
Files: deps/w32-pthreads/tests/cancel6a.c
@@ -32,76 +55,11 @@ Files: deps/w32-pthreads/tests/cancel6a.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
+Copyright: 1998, Ben Elliston
+ 1991-1999, Free Software Foundation, Inc
+ 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: ISC
-
-Files: plugins/text-freetype2/obs-convenience.c
- plugins/text-freetype2/text-freetype2.h
- plugins/text-freetype2/text-functionality.c
- plugins/text-freetype2/text-freetype2.c
- plugins/text-freetype2/obs-convenience.h
-Copyright: 2014 by Nibbles
-License: GPL-2+
-
-Files: libobs/obs-audio-controls.*
- plugins/text-freetype2/find-font-unix.c
- plugins/linux-pulseaudio/*
- plugins/linux-capture/linux-capture.c
- plugins/linux-capture/xcursor-xcb.*
- plugins/linux-capture/xcursor.*
- plugins/linux-capture/xhelpers.*
- plugins/linux-capture/xshm-input.c
- plugins/linux-v4l2/*
-Copyright: 2014 by Leonhard Oelke <leonhard at in-verted.de>
-License: GPL-2+
-
-Files:
- libobs-opengl/gl-subsystem.c
- obs/platform-x11.cpp
-Copyright: 2014 by Zachary Lund <admin at computerquip.com>
- 2013 by Hugh Bailey <obs.jim at gmail.com>
-License: GPL-2+
-
-Files: libobs/obs-nix.c
-Copyright: 2013 by Hugh Bailey <obs.jim at gmail.com>
- 2014 by Zachary Lund <admin at computerquip.com>
-License: GPL-2+
-
-Files: libobs-opengl/gl-cocoa.m
- libobs/obs-cocoa.c
- obs/window-remux.*
- libobs/media-io/video-matrices.c
- libobs/media-io/media-remux.c
- libobs/media-io/media-remux.h
- libobs/media-io/video-fourcc.c
-Copyright: 2013-2014 by Ruwen Hahn <palana at stunned.de>
-License: GPL-2+
-
-Files: libobs-opengl/gl-x11.c
-Copyright: 2014 by Zachary Lund <admin at computerquip.com>
-License: GPL-2+
-
-Files: libobs/callback/*
- libobs/util/*
- deps/ipc-util/*
-Copyright: 2013-2014 Hugh Bailey <obs.jim at gmail.com>
-License: ISC
-
-Files: libobs/util/utf8.*
-Copyright: 2007 Alexey Vatchenko <av at bsdua.org>
-License: ISC
-
-Files: libobs/util/vc/vc_inttypes.h
-Copyright: 2006 Alexander Chemeris
-License: BSD-3-clause
-
Files: libobs/util/vc/vc_stdint.h
Copyright: none
License: public-domain
@@ -113,66 +71,52 @@ License: public-domain
DISCLAIMED. This includes but is not limited to warranties of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-Files: libobs/graphics/libnsgif/*
-Copyright:
- 2003 James Bursa <bursa at users.sourceforge.net>
- 2004 John Tytgat <John.Tytgat at aaug.net>
- 2004 Richard Wilson <richard.wilson at netsurf-browser.org>
- 2008 Sean Fox <dyntryx at gmail.com>
-License: Expat
-
-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: ISC
+Files: plugins/decklink/linux/decklink-sdk/*
+ plugins/decklink/mac/decklink-sdk/*
+ plugins/decklink/win/decklink-sdk/*
+Copyright: 2009-2016, Blackmagic Design
+License: BSL
Files: plugins/obs-outputs/librtmp/*
-Copyright:
- 2008-2009 Andrej Stepanchuk
- 2009-2010 Howard Chu
- 2005-2008 Team XBMC
+Copyright: 2008-2009, Andrej Stepanchuk
+ 2009-2010, Howard Chu
+ 2005-2008, Team XBMC
License: LGPL-2.1+
Comment: Embedded copy of librtmp
Unfortunately it contains some OBS Studio specific patches.
-Files: plugins/obs-outputs/librtmp/md5.*
+Files: plugins/obs-outputs/librtmp/md5.c
+ plugins/obs-outputs/librtmp/md5.h
Copyright: none
License: public-domain
- This software was written by Alexander Peslyak in 2001. No copyright is
- claimed, and the software is hereby placed in the public domain.
- In case this attempt to disclaim copyright and place the software in the
- public domain is deemed null and void, then the software is
- Copyright (c) 2001 Alexander Peslyak and it is hereby released to the
- general public under the following terms:
- .
+Comment: TODO
+
+License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
- modification, are permitted.
+ modification, are permitted provided that the following conditions are met:
.
- There's ABSOLUTELY NO WARRANTY, express or implied.
-
-Files: plugins/obs-outputs/librtmp/cencode.*
-Copyright: none
-License: public-domain
- This is part of the libb64 project, and has been placed in the public domain.
- For details, see http://sourceforge.net/projects/libb64.
-Comment: Embedded copy of libb64.
-
-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
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ 3. The name of the author may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-Files: plugins/decklink/win/*-sdk/*
-Copyright: 2009,2014 Blackmagic Design
-License: Expat~Blackmagic
+License: BSL
Permission is hereby granted, free of charge, to any person or organization
obtaining a copy of the software and accompanying documentation covered by
this license (the "Software") to use, reproduce, display, distribute,
@@ -195,15 +139,25 @@ License: Expat~Blackmagic
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
-Files: plugins/obs-outputs/net-if.*
-Copyright: 2016 B. Lee <bl4 at postpile.net>
-License: GPL-2+
-Files: debian/*
-Copyright:
- 2015 Carl Fürstenberg <azatoth at gmail.com>
- 2016 Sebastian Ramacher <sramacher at debian.org>
-License: GPL-2+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
License: GPL-2+
This package is free software; you can redistribute it and/or modify
@@ -222,6 +176,19 @@ 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: ISC
+ Permission to use, copy, modify, and distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
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
@@ -255,61 +222,3 @@ License: LGPL-2.1+
.
On Debian systems, the complete text of the GNU Lesser General
Public License can be found in "/usr/share/common-licenses/LGPL-2.1".
-
-License: ISC
- Permission to use, copy, modify, and distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
- .
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-License: Expat
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- .
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- .
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- .
- 3. The name of the author may be used to endorse or promote products
- derived from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
--
obs-studio packaging
More information about the pkg-multimedia-commits
mailing list