[Pkg-voip-commits] [ring] 05/12: Merged GPL-3+ sections

[Alexandre Viau]

This is an automated email from the git hooks/post-receive script.

aviau pushed a commit to branch master
in repository ring.

commit 99a94f0a20e8abe95f76ca4f98b2df717534ba57
Author: aviau <alexandre at alexandreviau.net>
Date:   Fri Apr 8 10:41:53 2016 -0400

    Merged GPL-3+ sections
---
 debian/copyright | 35 +++++++----------------------------
 1 file changed, 7 insertions(+), 28 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 3dc88c9..0d1d8a1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -34,6 +34,13 @@ Files-Excluded: client-windows/*
 
 Files: *
 Copyright: 2004-2015 Savoir-faire Linux Inc.
+           1999 Tom Tromey
+           2000 Red Hat, Inc.
+           2010 Michael Kerrisk
+           2007-2009 Rémi Denis-Courmont
+           2002 Fabrice Bellard
+           2012 VLC authors and VideoLAN
+           2012-2013 LOTES TM LLC
 License: GPL-3+
 Comment: Upstream embeds everything that is needed to build ring inside the release tarball.
  Everything that is already in Debian has been removed.
@@ -62,19 +69,6 @@ Files: daemon/doc/dbus-api/*
 Copyright: ??
 License: ??
 
-Files: daemon/src/utf8_utils.cpp
-       daemon/src/utf8_utils.h
-Copyright: 1999 Tom Tromey
-           2000 Red Hat, Inc.
-           2014-2016 Savoir-faire Linux Inc.
-License: GPL-3+
-
-Files: daemon/src/fileutils.cpp
-Copyright: 2011-2016 Savoir-faire Linux Inc.
-           2010 Michael Kerrisk
-           2007-2009 Rémi Denis-Courmont
-License: GPL-3+
-
 Files: daemon/src/dlfcn.h
        daemon/src/dlfcn.c
 Copyright: 2007 Ramiro Polla
@@ -115,21 +109,6 @@ Copyright: 2008 Benjamin Kosnik <bkoz at redhat.com>
            2007-2010 Josh Triplett <josh at joshtriplett.org>
 License: GNUAllPermissive
 
-Files: daemon/src/media/video/androidvideo/video_device_monitor_impl.cpp
-       daemon/src/media/video/v4l2/video_device_monitor_impl.cpp
-Copyright: 2009 Rémi Denis-Courmont
-           2004-2016 Savoir-faire Linux Inc.
-License: GPL-3+
-
-Files: daemon/src/media/socket_pair.cpp
-Copyright: 2002 Fabrice Bellard
-           2012 VLC authors and VideoLAN
-License: GPL-3+
-
-Files: daemon/src/sip/pres_sub_client.cpp
-Copyright: 2012, 2013 LOTES TM LLC
-License: GPL-3+
-
 Files: daemon/test/sippxml/test_1.xml
        daemon/test/sippxml/test_2.xml
 Copyright: ???

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/ring.git