[SCM] ices2/master: Update copyright info: Use License-Grant and License-Reference fields. Thanks to Ben Finney.

js at users.alioth.debian.org js at users.alioth.debian.org
Thu Mar 24 23:23:36 UTC 2016


The following commit has been merged in the master branch:
commit 1eba61e7d5bd5195ed95efc20909ef602c177e64
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Mar 24 23:06:34 2016 +0100

    Update copyright info: Use License-Grant and License-Reference fields. Thanks to Ben Finney.

diff --git a/debian/copyright b/debian/copyright
index a18fcd4..fb8f868 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,6 +8,10 @@ Files: *
 Copyright: 2001-2002, Michael Smith <msmith at xiph.org>
   2001-2004, The IceS Development Team <team at icecast.org>
   2009-2012, Philipp Schafft <lion at lion.leolix.org>
+License-Grant:
+ This program is distributed under the terms of the GNU General Public
+ License, version 2. You may use, modify, and redistribute it under the
+ terms of this license. A copy should be included with this source.
 License: GPL-2
 
 Files: */Makefile.in
@@ -21,14 +25,25 @@ Files: compile
  ltmain.sh
  missing
 Copyright: 1996-2005, Free Software Foundation, Inc
+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, or (at your option) any
+ later version.
 License: GPL-2+ with Autoconf exception
  As a special exception to the GNU General Public License, if you
  distribute this file as part of a program that contains a configuration
  script generated by Autoconf, you may include it under the same
  distribution terms that you use for the rest of that program.
+License-Reference: /usr/share/common-licenses/GPL-2
 
 Files: src/thread/*
 Copyright: 1999-2000, the icecast team <team at icecast.org>
+License-Grant:
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Library General Public License as published
+ by the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
 License: LGPL-2+
 
 Files: src/avl/*
@@ -45,10 +60,11 @@ License: GAP
 
 Files: src/resample.h
 Copyright: 2002, Simon Hosie <gumboot at clear.net.nz>
-License: LGPL-2
+License-Grant:
  This program is licensed under the GNU Library General Public License,
  version 2, a copy of which is included with this program
  (LICENCE.LGPL).
+License: LGPL-2
 
 Files: install-sh
 Copyright: 1994, the Massachusetts Institute of Technology
@@ -57,47 +73,21 @@ License: MIT
 Files: debian/*
 Copyright: 2003, Keegan Quinn <ice at thebasement.org>
  2004-2008,2011-2012, Jonas Smedegaard <dr at jones.dk>
+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, or (at your option) any
+ later version.
 License: GPL-2+
 
 License: GPL-2
- This program is distributed under the terms of the GNU General Public
- License, version 2. You may use, modify, and redistribute it under the
- terms of this license. A copy should be included with this source.
-Comment:
- On Debian systems the 'GNU General Public License' version 2 is located
- in '/usr/share/common-licenses/GPL-2'.
- .
- You should have received a copy of the 'GNU General Public License'
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+License-Reference: /usr/share/common-licenses/GPL-2
 
 License: GPL-2+
- 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, or (at your option) any
- later version.
- .
- This program 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.
+License-Reference: /usr/share/common-licenses/GPL-2
 
 License: LGPL-2+
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2 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
- Library General Public License for more details.
-Comment:
- On Debian systems the 'GNU Library General Public License' version 2 is
- located in '/usr/share/common-licenses/LGPL-2'.
- .
- You should have received a copy of the 'GNU Library General Public
- License' along with this program.  If not, see
- <http://www.gnu.org/licenses/>.
+License-Reference: /usr/share/common-licenses/LGPL-2
 
 License: GAP
  This file is free software; the Free Software Foundation gives

-- 
ices2 packaging



More information about the pkg-multimedia-commits mailing list