[Pkg-voip-commits] [ortp] 07/10: Update copyright info: Separate License grants and references from actual licenses.

Jonas Smedegaard dr at jones.dk
Thu Apr 27 10:26:47 UTC 2017


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

js pushed a commit to branch master
in repository ortp.

commit 000455631119e36fc50517964138ed49921db007
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Apr 27 12:22:11 2017 +0200

    Update copyright info: Separate License grants and references from actual licenses.
---
 debian/copyright | 50 ++++++++++++++------------------------------------
 1 file changed, 14 insertions(+), 36 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 96efa8f..e011a65 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,6 +7,11 @@ Files: *
 Copyright: 2004, Simon Morlat
   2010,2014-2015,2017, Belledonne Communications SARL
  <sales at belledonne-communications.com>
+License-Grant:
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
 License: GPL-2+
  FIXME
 
@@ -14,6 +19,11 @@ Files: src/tests/*
 Copyright: 2001, Simon Morlat <simon.morlat at linphone.org>
   2015, Belledonne Communications SARL
  <sales at belledonne-communications.com>
+License-Grant:
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
 License: LGPL-2.1+
 
 Files:
@@ -40,24 +50,10 @@ Copyright: 2015 Felix Lechner <felix.lechner at gmail.com>
 License: GPL-2+
 
 License: LGPL-2.1+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the
- Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA 02110-1301, USA
- .
- On Debian systems, the complete text of the GNU Lesser General
- Public License version 2.1 can be found in
- "/usr/share/common-licenses/LGPL-2.1".
+License-Reference: /usr/share/common-licenses/LGPL-2.1
+
+License: GPL-2+
+License-Reference: /usr/share/common-licenses/GPL-2
 
 License: BSD-3-Clause~author
  Redistribution and use in source and binary forms, with or without
@@ -114,24 +110,6 @@ License: BSD-3-Clause~Wilson-Synesis
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in
- "/usr/share/common-licenses/GPL-2".
-
 License: FSFULLR
  This file is free software; the Free Software Foundation gives
  unlimited permission to copy and/or distribute it, with or without

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



More information about the Pkg-voip-commits mailing list