The following commit has been merged in the master branch: commit e94cea8a03bd31408eb5cfb4e0ab320bc8224016 Author: Jonas Smedegaard <d...@jones.dk> Date: Mon Jul 30 19:50:21 2012 +0200
Update copyright file: Cover new jasmine files, Expat licensed. diff --git a/debian/copyright b/debian/copyright index d5bcae3..ee7fc32 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,6 +6,10 @@ Files: * Copyright: 2010-2011 CloudMade, Vladimir Agafonkin License: BSD-2 +Files: spec/jasmine/* +Copyright: 2008-2011, Pivotal Labs +License: Expat + Files: debian/* Copyright: 2011 Andrew Harvey <andrew.harv...@gmail.com> License: BSD-2 or GPL-2+ @@ -38,6 +42,26 @@ License: BSD-2 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 + "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. + License: GPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public -- JavaScript library for displaying map data in web browsers _______________________________________________ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits