[SCM] flowblade/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 df69fbb3a7b01065c856777ab29b467306ab2496
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Mar 7 13:47:13 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 b98b2a4..3d5b058 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,12 @@ Source: https://github.com/jliljebl/flowblade
 
 Files: *
 Copyright: 2012-2014, Janne Liljeblad <janne.liljeblad at gmail.com>
-License: GPL-3+~Flowblade
+License-Grant:
+ Flowblade Movie Editor 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: Flowblade/res/filters/wipes/*
 Copyright: 2010, Jonathan Thomas <jonathan.oomph at gmail.com>
@@ -49,7 +54,9 @@ Comment:
 Files: hourglass_1.png
  star_2.png
 Copyright: 2012, Janne Liljeblad <janne.liljeblad at gmail.com>
-License: GPL-3+~Flowblade
+License-Grant:
+ License: GPL-3.0+
+License: GPL-3+
 
 Files: flowblade_splash_black_small.png
 Copyright: bazaardesigns at www.bazaardesigns.com
@@ -59,53 +66,18 @@ Comment:
 
 Files: debian/*
 Copyright: 2012-2015, 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+~Flowblade
- Flowblade Movie Editor 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.
- .
- Flowblade Movie Editor 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-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: GPL-3+
- 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 3 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.
+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 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.
- .
- 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: CC-BY-3.0
  THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS

-- 
flowblade packaging