[Pkg-voip-commits] [pjproject] 05/45: Update copyright info: Merge Expat-licensed files.

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository pjproject.

commit c1f7afe054fadbd32e9ce020a2faf1df0943a764
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Jun 7 11:04:01 2016 +0200

    Update copyright info: Merge Expat-licensed files.
---
 debian/copyright | 41 +++++++++--------------------------------
 1 file changed, 9 insertions(+), 32 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 70c116a..ae0259f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -222,42 +222,19 @@ Copyright: 2008, Thorvald Natvig
 License: BSD-3-clause-Xiph
 
 Files: third_party/portaudio/*
-Copyright: 1999-2008, Ross Bencina and Phil Burk
-License: Expat
-Comment:
- This software is not the copy of the library used in the Debian package.
-
-Files: third_party/portaudio/src/hostapi/asihpi/pa_linux_asihpi.c
-Copyright: 2003, Fred Gleason
-  2005,2006, Ludwig Schwardt
-License: Expat
-
-Files: third_party/portaudio/src/hostapi/jack/pa_jack.c
-Copyright: 1999-2002, Ross Bencina, Phil Burk
+Copyright: 1999-2007, Andrew Baldwin
+  1999-2007, Robert Marsanyi
+  1999-2008, Ross Bencina and Phil Burk
   2002, Joshua Haberman <joshua at haberman.com>
+  2003, Fred Gleason
   2004, Arve Knudsen <aknuds-1 at broadpark.no>
   2004, Stefan Westerfeld <stefan at space.twc.de>
+  2005-2006, Bjorn Roche
+  2005-2006, Ludwig Schwardt
 License: Expat
-
-Files:
- third_party/portaudio/src/hostapi/dsound/pa_win_ds.c
- third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c
- third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.h
-Copyright: 1999-2007, Robert Marsanyi
-  1999-2007, Ross Bencina
-  1999-2007, Phil Burk
-License: Expat
-
-Files:
- third_party/portaudio/src/os/win/pa_win_wdmks_utils.c
- third_party/portaudio/src/os/win/pa_win_wdmks_utils.h
-Copyright: 1999-2007, Andrew Baldwin
-  1999-2007, Ross Bencina
-License: Expat
-
-Files: third_party/portaudio/include/pa_mac_core.h
-Copyright: 2005-2006, Bjorn Roche
-License: Expat
+Comment:
+ This software is not the copy of the library used in the Debian
+ package.
 
 Files: pjsip-apps/src/pjsua/bb10/bar-descriptor.xml
 Copyright: 2011-2013, Research In Motion Limited

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