[Pkg-voip-commits] [pjproject] 06/17: Tidy copyright info: Sort Files sections by filecount > License > License-Grant > Copyright.

[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 f9c8644dd19a011f82dcf9ef75ed9642bfc6c323
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Sep 30 18:54:02 2017 +0200

    Tidy copyright info: Sort Files sections by filecount > License > License-Grant > Copyright.
---
 debian/copyright | 70 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index e7781d8..9c6df48 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -46,30 +46,6 @@ Comment:
  Some files has additional alternative licensing ignored as irrelevant
  for our redistribution.
 
-Files: debian/*
-Copyright: 2013, Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-License: GPL-2+
-
-Files: pjlib-util/src/pjlib-util/crc32.c
-Copyright: None
-License: public-domain
- This file is partly taken from Crypto++ library
- (<http://www.cryptopp.com/>) and
- <http://www.di-mgt.com.au/crypto.html#CRC>.
- .
- Since the original version of the code is put in public domain, this
- file is put on public domain as well.
-
-Files: pjlib-util/src/pjlib-util/md5.c
-Copyright: None
-License: public-domain
- This code is in the public domain; do with it what you wish.
-
-Files: pjlib-util/src/pjlib-util/sha1.c
-Copyright: None
-License: public-domain
- Still 100% public domain
-
 Files: pjlib/src/pj/compat/longjmp_i386.S
  pjlib-util/src/pjlib-util/getopt.c
 Copyright: Mike Borella <mike_borella at mw.3com.com>
@@ -85,6 +61,14 @@ Comment:
  only it has a comment "this file has now become GPL" on top (comment
  removed by Upstream).
 
+Files: pjsip-apps/src/pjsua/bb10/bar-descriptor.xml
+Copyright: 2011-2013, Research In Motion Limited
+License-Grant:
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at <http://www.apache.org/licenses/LICENSE-2.0>
+License: Apache-2
+
 Files: pjlib/src/pj/compat/setjmp_i386.S
 Copyright: 1995-1997, 2000-2001, Free Software Foundation, Inc.
 License-Grant:
@@ -94,10 +78,6 @@ License-Grant:
  License, or (at your option) any later version.
 License: LGPL-2.1+
 
-Files: pjmedia/src/pjmedia/alaw_ulaw.c
-Copyright: Sun Microsystems, Inc.
-License: Rdisc~code
-
 Files: third_party/mp3/BladeMP3EncDLL.h
 Copyright: 1999-2002 A.L. Faber
 License-Grant:
@@ -107,13 +87,33 @@ License-Grant:
  (at your option) any later version.
 License: LGPL-2.1+
 
-Files: pjsip-apps/src/pjsua/bb10/bar-descriptor.xml
-Copyright: 2011-2013, Research In Motion Limited
-License-Grant:
- Licensed under the Apache License, Version 2.0 (the "License"); you may
- not use this file except in compliance with the License. You may obtain
- a copy of the License at <http://www.apache.org/licenses/LICENSE-2.0>
-License: Apache-2
+Files: pjmedia/src/pjmedia/alaw_ulaw.c
+Copyright: Sun Microsystems, Inc.
+License: Rdisc~code
+
+Files: pjlib-util/src/pjlib-util/crc32.c
+Copyright: None
+License: public-domain
+ This file is partly taken from Crypto++ library
+ (<http://www.cryptopp.com/>) and
+ <http://www.di-mgt.com.au/crypto.html#CRC>.
+ .
+ Since the original version of the code is put in public domain, this
+ file is put on public domain as well.
+
+Files: pjlib-util/src/pjlib-util/md5.c
+Copyright: None
+License: public-domain
+ This code is in the public domain; do with it what you wish.
+
+Files: pjlib-util/src/pjlib-util/sha1.c
+Copyright: None
+License: public-domain
+ Still 100% public domain
+
+Files: debian/*
+Copyright: 2013, Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+License: GPL-2+
 
 License: GPL-2+
 License-Reference: /usr/share/common-licenses/GPL-2

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