[Pkg-javascript-commits] [leaflet-markercluster] 210/219: Update copyright info: Use License-Grant and License-Reference fields. Thanks to Ben Finney.

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository leaflet-markercluster.

commit 68f20c6a9f926b3f106e0bd043e00a9a25541f44
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat May 7 11:28:55 2016 +0200

    Update copyright info: Use License-Grant and License-Reference fields. Thanks to Ben Finney.
---
 debian/copyright | 61 ++++++++++++--------------------------------------------
 1 file changed, 13 insertions(+), 48 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 06ece43..6789f99 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,15 +11,11 @@ Files-Excluded:
 Files: *
 Copyright: 2012, David Leaver
   2012, Smartrak
-License: Expat
-Comment:
- License:
- .
+License-Grant:
  Leaflet.markercluster is free software, and may be redistributed under
  the MIT-LICENSE.
- .
- Comment:
- .
+License: Expat
+Comment:
  Included file MIT-LICENCE.txt contains Expat license.
 
 Files: spec/expect.js
@@ -50,15 +46,11 @@ License: Expat
 
 Files: src/MarkerCluster.Spiderfier.js
 Copyright: 2011-2012, George MacKerron
-License: Expat
-Comment:
- License:
- .
+License-Grant:
  Released under the MIT licence:
  http://opensource.org/licenses/mit-license
- .
- Comment:
- .
+License: Expat
+Comment:
  Code lacks formal copyright and licensing statements, but comment
  refers to https://github.com/jawj/OverlappingMarkerSpiderfier-Leaflet
  which (as of 2013-11-03) contains a single coffeescript file with above
@@ -67,6 +59,11 @@ Comment:
 Files: debian/*
 Copyright: 2012, Andrew Harvey <andrew.harvey4 at gmail.com>
   2010-2011,2013-2014 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+
 
 Files: debian/patches/*.patch
@@ -173,39 +170,7 @@ License: BSD-3-clause~Johansen
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 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'.
- .
- 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-3+
- 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 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 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/leaflet-markercluster.git