[SCM] bitmeter/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 Aug 24 16:13:54 UTC 2017


The following commit has been merged in the master branch:
commit af38fc719fe2e94d83c20088bd2b5375e39f5c91
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Aug 24 16:56:57 2017 +0200

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

diff --git a/debian/copyright b/debian/copyright
index 60bb752..f093d8e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,6 +11,11 @@ Files: compile
  depcomp
  missing
 Copyright: 1996-1997, 1999-2000, 2002 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~you 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
@@ -19,6 +24,9 @@ License: GPL-2+ with Autoconf~you exception
 
 Files: aclocal.m4
 Copyright: 1995-2002, Free Software Foundation, Inc.
+License-Grant:
+ This file is free software, distributed under the terms of the GNU
+ General Public License.
 License: FSFULLR and GPL-2+ with Autoconf exception
  As a special exception to the GNU General Public License, this file may
  be distributed as part of a program that contains a configuration
@@ -45,24 +53,15 @@ Files: debian/*
 Copyright:
   2004-2006, Robert Jordens <rjo at gmx.de>
   2010, 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 file 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 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.
- .
- On Debian systems, the complete text of the GNU General Public License
- (GPL) version 2 can be found an 2/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: FSFUL
  This configure script is free software; the Free Software Foundation

-- 
Bitmeter packaging



More information about the pkg-multimedia-commits mailing list