[Pkg-voip-commits] [asterisk] 08/22: Update copyright info: Fix update and merge unrestricted 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 asterisk.

commit e150a6c916c7f563cdcfddd80bb74476ed7c672f
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon May 30 14:13:43 2016 +0200

    Update copyright info: Fix update and merge unrestricted licensed files.
---
 debian/copyright | 46 ++++++++++++++++++----------------------------
 1 file changed, 18 insertions(+), 28 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index e59462c..22295dc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -184,25 +184,28 @@ Files: channels/console_gui.c
 Copyright: 2007-2008 Luigi Rizzo <rizzo at icir.org>
 License: GPL-2-Asterisk
 
-Files: apps/app_morsecode.c
+Files: apps/app_exec.c
+ apps/app_followme.c
+ apps/app_morsecode.c
+ apps/app_sayunixtime.c
+ apps/app_stack.c
  apps/app_verbose.c
- funcs/func_curl.c
  funcs/func_cut.c
+ funcs/func_realtime.c
  res/res_limit.c
- apps/app_sayunixtime.c
-Copyright: 2003-2006, Tilghman Lesher.
-License: GPL-2-Asterisk
-Comment:
- Files carry a different license. Author verified in private mail the
- new license. Should be updated in Upstream soon (and anyway, Digium has
- the legal right to relicense this code).
+Copyright:
+  2003-2006, Tilghman Lesher
+  2005-2006, BJ Weschke <bweschke at btwtech.com>
+  2006, Digium, Inc.
+  2006, Philipp Dunkel <philipp.dunkel at ebox.at>
+License: Unrestricted~author
+ This code is released by the author with no restrictions on usage.
 
-Files: apps/app_exec.c
-Copyright: 2004-2005, Tilghman Lesher.
-  2006, Philipp Dunkel
-License: GPL-2-Asterisk
-Comment:
- See above comment.
+Files: funcs/func_curl.c
+Copyright: 2004-2006, Tilghman Lesher
+License: Unrestricted~app_curl
+ app_curl.c is distributed with no restrictions on usage or
+ redistribution.
 
 Files: apps/app_skel.c
  tests/test_skel.c
@@ -297,19 +300,6 @@ Files: main/plc.c
 Copyright: 2004, Steve Underwood
 License: GPL-2-Asterisk
 
-Files: apps/app_stack.c
-Copyright: 2004-2006, Tilghman Lesher <app_stack_v003 at the-tilghman.com>
-License: GPL-2-Asterisk
-
-Files: apps/app_followme.c funcs/func_realtime.c
-Copyright: 2005-2006, BJ Weschke.
-License: unlimited-license
- This code is released by the author with no restrictions on usage.
-Comment:
- Likewise here author clarified on private mail:
- "No limitations on redistribution and or redistribution of modified
- copies." and likewise Digium is allowed to relicense the code.
-
 Files: main/md5.c
 Copyright: None
 License: public-domain

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