[Pkg-osm-commits] [SCM] leaflet branch, master, updated. debian/0.5.1-1-2440-gc0c91ef

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit 028ea0ab9785171e117fd2e27c5a6d50b5032de3
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Jun 27 01:06:03 2013 +0200

    Update copyright file: Drop Files section for no longer shipped jasmine. Add Files section for convenience code copy of sinon.js (derivation of BSD-3-clause) and expect.js (Expat).

diff --git a/debian/copyright b/debian/copyright
index 548df4e..1a81bb3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,9 +11,23 @@ Comment:
  LICENSE file was updated on 2012-01-11 to clarify coverage of main
  copyright holders, even if still written as a combo at other places.
 
-Files: spec/jasmine/*
-Copyright: 2008-2011, Pivotal Labs
+Files: spec/sinon.js
+Copyright: 2010-2013, Christian Johansen <christian at cjohansen.no>
+  2011, Sven Fuchs
+  2012, Maximilian Antoni
+License: BSD-3-clause~Christian
+
+Files: spec/expect.js
+Copyright:
+  Joyent, Inc. and other Node contributors
+  2010-2011 TJ Holowaychuk <tj at vision-media.ca>
+  2011 Aseem Kishore <aseem.kishore at gmail.com>
+  2011 Guillermo Rauch <guillermo at learnboost.com>
 License: Expat
+Comment:
+ Code lacks copyright header, but is clearly same code as
+ <https://github.com/LearnBoost/expect.js> with above listed copyright
+ and licensing.
 
 Files: debian/*
 Copyright: 2011, Andrew Harvey <andrew.harvey4 at gmail.com>
@@ -51,6 +65,32 @@ License: BSD-2-clause
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+License: BSD-3-clause~Christian
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+ * Neither the name of Christian Johansen nor the names of his
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the

-- 
JavaScript library for displaying map data in web browsers