[Pkg-javascript-commits] [leaflet-markercluster] 29/49: Tighten licensing of packaging to GPL-3+, with only patches using more liberal triple-licensing.

[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 e116bcbec0479317a1360af2d0774439e0d377d3
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Nov 3 22:17:25 2013 +0100

    Tighten licensing of packaging to GPL-3+, with only patches using more liberal triple-licensing.
---
 debian/copyright | 29 ++++++++++++++++++++++++-----
 debian/rules     |  4 ++--
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 0a78a9f..a17c299 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,14 +8,14 @@ Copyright: 2012 Smartrak, David Leaver
 License: Expat
 
 Files: debian/*
+Copyright: 2012, Andrew Harvey <andrew.harvey4 at gmail.com>
+  2010-2011,2013 Jonas Smedegaard <dr at jones.dk>
+License: GPL-3+
+
+Files: debian/patches/*.patch
 Copyright: 2012 Andrew Harvey <andrew.harvey4 at gmail.com>
 License: Expat or BSD-2-clause or GPL-2+
 
-Files: debian/rules
-Copyright: 2012, Andrew Harvey <andrew.harvey4 at gmail.com>
-           2010-2011, Jonas Smedegaard <dr at jones.dk>
-License: GPL-2+
-
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the
@@ -81,3 +81,22 @@ License: 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: 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/>.
diff --git a/debian/rules b/debian/rules
index 7c95fcf..c01ce17 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,12 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
-# Copyright 2010, 2011 Jonas Smedegaard <dr at jones.dk>
+# Copyright 2010, 2011, 2013 Jonas Smedegaard <dr at jones.dk>
 # Copyright 2012 Andrew Harvey <andrew.harvey4 at gmail.com>
 # Description: Main Debian packaging script for Leaflet.markercluster
 #
 # 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)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # This program is distributed in the hope that it will be useful, but

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