[SCM] obs-studio/master: Re-add win32-pthreads

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Wed Apr 19 20:07:28 UTC 2017


The following commit has been merged in the master branch:
commit 3d84cd58bb869c97a81bc236e82d132896da55e2
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Apr 19 22:02:38 2017 +0200

    Re-add win32-pthreads

diff --git a/debian/copyright b/debian/copyright
index 3a72351..de3f00f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: obs-studio
 Source: https://obsproject.com
 Files-Excluded:
  plugins/win-*
- deps/w32-pthreads/*
+ deps/w32-pthreads/need_errno.h
  deps/jansson/*
  deps/blake2/*
  deps/lzma/*
@@ -17,6 +17,25 @@ Files: deps/glad/include/KHR/khrplatform.h
 Copyright: 2008-2009 The Khronos Group Inc
 License: Expat
 
+Files: deps/w32-pthreads/*
+Copyright:
+ 1998 John E. Bossom
+ 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>

-- 
obs-studio packaging



More information about the pkg-multimedia-commits mailing list