[Pkg-osm-commits] [SCM] leaflet branch, master, updated. debian/0.4.5-1-8-gb691156

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit 691b70a75c4d62bbb2753fc5bbe4df0ac3fb3ce6
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Jan 11 16:15:10 2013 +0100

    Extend copyright coverage of packaging, and tighten to GPL-3+ (except patch 2001 kept as BSD-2-clause or GPL-2+).

diff --git a/debian/copyright b/debian/copyright
index f5d559d..144b9b3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,13 +12,13 @@ Copyright: 2008-2011, Pivotal Labs
 License: Expat
 
 Files: debian/*
-Copyright: 2011 Andrew Harvey <andrew.harvey4 at gmail.com>
-License: BSD-2-clause or GPL-2+
-
-Files: debian/rules
 Copyright: 2011, Andrew Harvey <andrew.harvey4 at gmail.com>
-           2010-2011, Jonas Smedegaard <dr at jones.dk>
-License: GPL-2+
+  2010-2013, Jonas Smedegaard <dr at jones.dk>
+License: GPL-3+
+
+Files: debian/patches/2001-dont_test_during_build.patch
+Copyright: 2012, Andrew Harvey <andrew.harvey4 at gmail.com>
+License: BSD-2-clause or GPL-2+
 
 License: BSD-2-clause
  All rights reserved.
@@ -85,3 +85,19 @@ 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'.
diff --git a/debian/rules b/debian/rules
index 48516c8..f43a0a5 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 2011 Andrew Harvey <andrew.harvey4 at gmail.com>
+# Copyright © 2010, 2011, 2012, 2013 Jonas Smedegaard <dr at jones.dk>
+# Copyright © 2011 Andrew Harvey <andrew.harvey4 at gmail.com>
 # Description: Main Debian packaging script for Leaflet
 #
 # 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

-- 
JavaScript library for displaying map data in web browsers