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

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit bd5c97a4d8d8ab35f24a6e0ca7f96bdbe8302399
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Nov 29 17:40:39 2015 +0100

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

diff --git a/debian/copyright b/debian/copyright
index c0ba968..45c8efa 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,20 +7,35 @@ Source: http://thomas.apestaart.org/download/morituri/
 
 Files: *
 Copyright: 2009-2011, Thomas Vander Stichele <thomas at apestaart.org>
+License-Grant:
+ morituri 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 3 of the License, or (at your
+ option) any later version.
 License: GPL-3+
 
 Files: */Makefile.in
 Copyright: 1994-2013, Free Software Foundation, Inc.
-License: GAP~Makefile.in
+License-Grant:
+ This Makefile.in is free software; the Free Software Foundation gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+License: GAP
 
 Files: missing
  py-compile
 Copyright: 1996-2013, Free Software Foundation, Inc.
-License: GPL-2+ with Autoconf exception
+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.
+ .
  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: GPL-2+ with Autoconf exception
 
 Files: install-sh
 Copyright: 1994, X Consortium
@@ -42,6 +57,8 @@ License: GAP
 
 Files: morituri/extern/musicbrainzngs/*
 Copyright: 2011, Alastair Porter, Adrian Sampson, and others
+ This file is distributed under a BSD-2-Clause type license. See the
+ COPYING file for more information.
 License: BSD-2-clause
 Comment:
  Convenience code copy of
@@ -49,42 +66,18 @@ Comment:
 
 Files: debian/*
 Copyright: 2009-2013, 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 3, or (at your option) any
+ later version.
 License: GPL-3+
 
 License: GPL-3+
- morituri 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 3 of the License, or (at your
- option) any later version.
- .
- morituri 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.
- .
- Comment:
- .
- On Debian systems the 'GNU General Public License' version 3 is located
- in '/usr/share/common-licenses/GPL-3'.
- .
- 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-3
 
 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.
- .
- Comment:
- .
- On Debian systems the 'GNU General Public License' version 2 is located
- in '/usr/share/common-licenses/GPL-2'.
+License-Reference: /usr/share/common-licenses/GPL-2
 
 License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
@@ -144,11 +137,6 @@ License: GAP~configure
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
 
-License: GAP~Makefile.in
- This Makefile.in is free software; the Free Software Foundation
- gives unlimited permission to copy and/or distribute it,
- with or without modifications, as long as this notice is preserved.
-
 License: GAP~Makefile.in.in
  This file may be copied and used freely without restrictions.  It may
  be used in projects which are not available under a GNU Public License,

-- 
morituri packaging