[SCM] libde265/master: Updated licenses of remaining files.

[fancycode-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8b41823582d91bb59f5e19537d4b9c2b2dabc4c8
Author: Joachim Bauch <bauch at struktur.de>
Date:   Thu Apr 3 15:05:02 2014 +0200

    Updated licenses of remaining files.

diff --git a/debian/copyright b/debian/copyright
index 9a4d01d..f0e2b29 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,37 +1,25 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: FIXME
-Upstream-Contact: FIXME
-Source: FIXME
+Upstream-Name: libde265
+Upstream-Contact: struktur AG <opensource at struktur.de>
+Source: https://github.com/strukturag/libde265
 
 Files: *
-Copyright: 2013, StrukturAG, Dirk Farin, <farin at struktur.de>
+Copyright: 2013-2014, struktur AG, Dirk Farin <farin at struktur.de>
 License: LGPL-3+
 
 Files:
- dec265/sdl.cc
- dec265/sdl.hh
- extra/getopt.h
- extra/stdint.h
- libde265/acceleration.h
- libde265/de265-version.h
- libde265/fallback-dct.c
- libde265/fallback-dct.h
- libde265/fallback-motion.c
- libde265/fallback-motion.h
- libde265/fallback.c
- libde265/fallback.h
- libde265/threads.c
  libde265/x86/sse-dct.c
  libde265/x86/sse-dct.h
  libde265/x86/sse-motion.c
  libde265/x86/sse-motion.h
- libde265/x86/sse.c
- libde265/x86/sse.h
-Copyright: *No copyright*
-License: UNKNOWN
- FIXME
+Copyright:
+ 2013 openHEVC contributors
+ 2013-2014, struktur AG, Dirk Farin <farin at struktur.de>
+License: LGPL-3+
 
 Files: dec265/dec265.cc
+ dec265/sdl.cc
+ dec265/sdl.hh
  sherlock265/VideoDecoder.cc
  sherlock265/VideoDecoder.hh
  sherlock265/VideoPlayer.cc
@@ -39,13 +27,19 @@ Files: dec265/dec265.cc
  sherlock265/VideoWidget.cc
  sherlock265/VideoWidget.hh
  sherlock265/sherlock265.cc
- extra/stdbool.h
-Copyright:
-  2013 StrukturAG, Dirk Farin, <farin at struktur.de>
-  1998-2013 Free Software Foundation, Inc
+Copyright: 2013-2014 struktur AG, Dirk Farin <farin at struktur.de>
+License: GPL-3+
+
+Files: scripts/decodestreams.py
+Copyright: 2013-2014 struktur AG, Joachim Bauch <bauch at struktur.de>
+License: GPL-3+
+
+Files: extra/stdbool.h
+Copyright: 1998-2013 Free Software Foundation, Inc
 License: GPL-3+
 
 Files: extra/getopt.c
+ extra/getopt.h
  extra/getopt_long.c
 Copyright: 1987-1996 The Regents of the University of California
 License: BSD-4-clause
@@ -53,7 +47,7 @@ License: BSD-4-clause
 Files: libde265/md5.c
  libde265/md5.h
 Copyright: No copyright holder
-License: public-domain
+License: public-domain-1
  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
@@ -80,10 +74,30 @@ License: public-domain
  optimizations are not included to reduce source code size and avoid
  compile-time configuration.
 
+Files: extra/stdint.h
+Copyright: No copyright holder
+License: public-domain-2
+ ISO C9x  7.18  Integer types <stdint.h>
+ Based on ISO/IEC SC22/WG14 9899 Committee draft (SC22 N2794)
+ .
+ THIS SOFTWARE IS NOT COPYRIGHTED
+ .
+ Contributor: Danny Smith <danny_r_smith_2001 at yahoo.co.nz>
+ .
+ This source code is offered for use in the public domain. You may
+ use, modify or distribute it freely.
+ .
+ This code is distributed in the hope that it will be useful but
+ WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
+ DISCLAIMED. This includes but is not limited to warranties of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ .
+ Date: 2000-12-02
+
 Files: extra/win32cond.c
  extra/win32cond.h
 Copyright:
-  1993-2009 Douglas C. Schmidt and his research group at
+ 1993-2009 Douglas C. Schmidt and his research group at
  Washington University, University of California, Irvine, and
  Vanderbilt University, Copyright (c) 1993-2009
 License: other-1
@@ -148,8 +162,8 @@ License: BSD-4-clause
     documentation and/or other materials provided with the distribution.
  3. All advertising materials mentioning features or use of this software
     must display the following acknowledgement:
-	This product includes software developed by the University of
-	California, Berkeley and its contributors.
+    This product includes software developed by the University of
+    California, Berkeley and its contributors.
  4. Neither the name of the University nor the names of its contributors
     may be used to endorse or promote products derived from this software
     without specific prior written permission.

-- 
libde265 packaging