[SCM] libde265/master: Group files by license, properly fix multiline copyright listing

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Fri Apr 25 10:07:02 UTC 2014


The following commit has been merged in the master branch:
commit 850ecf32b1b20b6830d559ed1f32b1a4fce2dae3
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Apr 25 11:01:20 2014 +0100

    Group files by license, properly fix multiline copyright listing

diff --git a/debian/copyright b/debian/copyright
index a279700..6b3924d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,17 +4,10 @@ Upstream-Contact: struktur AG <opensource at struktur.de>
 Source: https://github.com/strukturag/libde265
 
 Files: *
-Copyright: 2013-2014, struktur AG, Dirk Farin <farin at struktur.de>
-License: LGPL-3+
-
-Files:
- libde265/x86/sse-dct.c
- libde265/x86/sse-dct.h
- libde265/x86/sse-motion.c
- libde265/x86/sse-motion.h
 Copyright:
- 2013 openHEVC contributors
- 2013-2014, struktur AG, Dirk Farin <farin at struktur.de>
+  2013-2014 struktur AG, Dirk Farin <farin at struktur.de>
+  2013 openHEVC contributors
+  2013-2014, struktur AG, Dirk Farin <farin at struktur.de>
 License: LGPL-3+
 
 Files: dec265/dec265.cc
@@ -27,15 +20,10 @@ Files: dec265/dec265.cc
  sherlock265/VideoWidget.cc
  sherlock265/VideoWidget.hh
  sherlock265/sherlock265.cc
-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
+Copyright:
+  2013-2014 struktur AG, Dirk Farin <farin at struktur.de>
+  2013-2014 struktur AG, Joachim Bauch <bauch at struktur.de>
+  1998-2013 Free Software Foundation, Inc
 License: GPL-3+
 
 Files: extra/getopt.c
@@ -97,9 +85,9 @@ License: public-domain-2
 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
+ Vanderbilt University
 License: other-1
  ACE(TM), TAO(TM), CIAO(TM), DAnCE>(TM), and CoSMIC(TM) (henceforth
  referred to as "DOC software") are copyrighted by Douglas C. Schmidt

-- 
libde265 packaging



More information about the pkg-multimedia-commits mailing list