[SCM] x265/master: Update copyright info using decopy

Wed Apr 26 20:31:35 UTC 2017

The following commit has been merged in the master branch:
commit 11857353c8c9a4ec06825d99a5232160241c793b
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Apr 26 22:12:13 2017 +0200

    Update copyright info using decopy

diff --git a/debian/copyright b/debian/copyright
index f02d3ee..85de994 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,39 +3,36 @@ Upstream-Name: x265
 Source: https://bitbucket.org/multicoreware/x265/downloads
 
 Files: *
-Copyright: 2013-2016, x265 project
+Copyright: 2013-2017, MulticoreWare, Inc
            2003-2013, x264 project
 License: GPL-2+
 
+Files: debian/*
+Copyright: 2016, Ondřej Nový <onovy at debian.org>
+           2014-2017, Sebastian Ramacher <sramacher at debian.org>
+License: GPL-2+
+
+Files: source/cmake/FindVLD.cmake
+Copyright: 2013-2017, MulticoreWare, Inc
+License: Expat
+
+Files: source/common/x86/x86inc.asm
+Copyright: 2013-2017, MulticoreWare, Inc
+           2005-2014, x264 project
+License: ISC
+
 Files: source/compat/getopt/*
-Copyright: 1987-1996,1998-2001, Free Software Foundation, Inc.
+Copyright: 1987-2001, Free Software Foundation, Inc
 License: LGPL-2.1+
- This library 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.1 of the License, or (at your option) any later version.
- .
- This library 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
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free
- Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301  USA.
- .
- On Debian systems, the complete text of the GNU Lesser General Public
- License can be found in /usr/share/common-licenses/LGPL-2.1 file.
 
-Files: source/cmake/FindNuma.cmake
-       source/cmake/FindVtune.cmake
-Copyright: 2015, Steve Borho
-           2015, Pradeep Ramachandran
+Files: source/dynamicHDR10/*
+Copyright: 2017, Samsung Electronics, DMS Lab, Samsung Research America and Samsung Research Tijuana
 License: GPL-2+
 
-Files: source/cmake/FindVLD.cmake
-Copyright: 2012, Sergiu Dotenco
+Files: source/dynamicHDR10/json11/*
+Copyright: 2013, Dropbox, Inc
+License: Expat
+
 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
@@ -55,27 +52,6 @@ License: Expat
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
 
-Files: source/common/x86/x86inc.asm
-Copyright: 2005-2014, x264 project
-           2013-2014, x265 project
-License: ISC
- Permission to use, copy, modify, and/or 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.
-
-Files: debian/*
-Copyright: 2014-2017, Sebastian Ramacher <sramacher at debian.org>
-           2016, Ondřej Nový <onovy at debian.org>
-License: GPL-2+
-
 License: GPL-2+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public
@@ -97,3 +73,36 @@ License: GPL-2+
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
+
+License: ISC
+ Permission to use, copy, modify, and/or 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.1+
+ This library 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.1 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301  USA.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License can be found in /usr/share/common-licenses/LGPL-2.1 file.
+

-- 
x265 packaging

