[Pkg-javascript-commits] [SCM] display and interaction library for tile-based maps branch, master, updated. debian/0.20.0+ds1-1-2-gd1643a8

[David Paleino]

The following commit has been merged in the master branch:
commit 77a25646ad0bc0ab9fea8d98be90cb09acea8ddf
Author: David Paleino <dapal at debian.org>
Date:   Fri Oct 28 00:14:20 2011 +0200

    Fix licensing information

diff --git a/debian/changelog b/debian/changelog
index 63fe0d4..cc46341 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+modestmaps-js (0.20.0+ds1-2) UNRELEASED; urgency=low
+
+  * Fix licensing information
+
+ -- David Paleino <dapal at debian.org>  Fri, 28 Oct 2011 00:14:11 +0200
+
 modestmaps-js (0.20.0+ds1-1) unstable; urgency=low
 
   * Initial release
diff --git a/debian/copyright b/debian/copyright
index 2f3dbde..cd8bd70 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 Format: http://dep.debian.net/deps/dep5
 
 Files: *
-Copyright: ©, Tom Carden <tom at tom-carden.co.uk>
+Copyright: © 2011, Stamen Design
 License: BSD-3
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are
@@ -68,3 +68,25 @@ License: Apache-2.0
  .
  On Debian systems, the complete text of the Apache License, version 2.0,
  can be found in "/usr/share/common-licenses/Apache-2.0".
+
+Files: test/browser/lib/jasmine-1.1.0.rc1
+Copyright: © 2008-2011, Pivotal Labs
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-- 
display and interaction library for tile-based maps