debian/0000755000000000000000000000000011772203136007170 5ustar debian/patches/0000755000000000000000000000000011772201413010613 5ustar debian/patches/README0000644000000000000000000000021111347270217011473 0ustar 0xxx: Grabbed from upstream development. 1xxx: Possibly relevant for upstream adoption. 2xxx: Only relevant for official Debian release. debian/patches/020120215~ba5b40c.patch0000644000000000000000000000531311772201413014051 0ustar Description: fix non-removable attributions regression Origin: upstream, https://github.com/CloudMade/Leaflet/commit/ba5b40 Bug: https://github.com/CloudMade/Leaflet/issues/488 Author: mourner Last-Update: 2012-02-15 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,10 @@ * Fixed a bug where `TileLayer.WMS` wouldn't take `insertAtTheBottom` option into account (by [@bmcbride](https://github.com/bmcbride)). [#478](https://github.com/CloudMade/Leaflet/pull/478) +## 0.3.2 RC + + * Fixed a regression where removeLayer would not remove corresponding attribution. [#488](https://github.com/CloudMade/Leaflet/issues/488) + ## 0.3.1 (14.02.2012) * Fixed a regression where default marker icons wouldn't work if Leaflet include url contained a query string. --- a/debug/control/control-layers.html +++ b/debug/control/control-layers.html @@ -5,9 +5,9 @@ - + - + @@ -15,23 +15,23 @@
- \ No newline at end of file + --- a/src/control/Control.Attribution.js +++ b/src/control/Control.Attribution.js @@ -51,7 +51,7 @@ var attribs = []; for (var i in this._attributions) { - if (this._attributions.hasOwnProperty(i)) { + if (this._attributions.hasOwnProperty(i) && this._attributions[i]) { attribs.push(i); } } debian/patches/2001-dont_test_during_build.patch0000644000000000000000000000134411772200226016751 0ustar Description: avoid running tests until jshlint is packaged Author: Andrew Harvey Forwarded: not-needed Last-Update: 2012-02-14 --- a/Jakefile.js +++ b/Jakefile.js @@ -1,5 +1,5 @@ var build = require('./build/build.js'), - lint = require('./build/hint.js'); + lint = null; var crlf = '\r\n', COPYRIGHT = '/*' + crlf + ' Copyright (c) 2010-2011, CloudMade, Vladimir Agafonkin' + crlf + @@ -23,7 +23,7 @@ }); desc('Combine and compress Leaflet source files'); -task('build', ['lint'], function (compsBase32, buildName) { +task('build', function (compsBase32, buildName) { var pathPart = 'dist/leaflet' + (buildName ? '-' + buildName : ''), srcPath = pathPart + '-src.js', path = pathPart + '.js'; debian/patches/series0000644000000000000000000000007211772177650012046 0ustar 020120215~ba5b40c.patch 2001-dont_test_during_build.patch debian/control0000644000000000000000000000136611772202770010604 0ustar Source: leaflet Section: web Priority: extra Maintainer: Debian OpenStreetMap Team Uploaders: Andrew Harvey , Jonas Smedegaard Build-Depends: cdbs (>= 0.4.106~), debhelper (>= 8~), dh-buildinfo, node-uglify, node-jake Standards-Version: 3.9.3 Homepage: http://leaflet.cloudmade.com/ Vcs-Git: git://git.debian.org/pkg-osm/leaflet.git Vcs-Browser: http://git.debian.org/?p=pkg-osm/leaflet.git Package: libjs-leaflet Architecture: all Depends: ${misc:Depends} Recommends: javascript-common Description: JavaScript library for displaying map data in web browsers Leaflet is a modern JavaScript library for interactive maps on both desktop and mobile browsers by CloudMade. debian/source/0000755000000000000000000000000011772165245010500 5ustar debian/source/format0000644000000000000000000000001411772165245011706 0ustar 3.0 (quilt) debian/changelog0000644000000000000000000000267511772203136011054 0ustar leaflet (0.3.1-1) unstable; urgency=low * New upstream release. Closes: bug#678419. [ Jonas Smedegaard ] * Update watch, rules and copyrigh files to directly use github.com URL (not githubredir.debian.net or Homepage). * Fix tighten build-dpendency on cdbs: Needed for recent debhelper support. Relax slightly build-dependency on debhelper: Eases backporting. * Put aside upstream shipped autogenerated files during build (instead of stripping and repackaging source tarball). Closes: bug#678426. Tighten build-dependency on cdbs: Needed for routine to put files aside. * Refresh patch, minimize, add DEP3 header, and rename to 2001. * Add debian/patches/README documenting numbering micro-policy. * Add patch from upstream VCS to fix non-removable attributions regression. * Git-ignore quilt .pc subdir to ease git-buildpackage usage. * Add myself as uploader. * Bump standards-version to 3.9.3. -- Jonas Smedegaard Tue, 26 Jun 2012 02:46:21 +0200 leaflet (0.3-1) unstable; urgency=low * New upstream release. * Update debian/rules for new upstream build system. * Patch upstream build system to avoid running tests until jshlint is packaged -- Andrew Harvey Tue, 14 Feb 2012 07:11:04 +1100 leaflet (0.2.1-1) unstable; urgency=low * Initial release. * Closes: #641883 -- Andrew Harvey Sat, 17 Sep 2011 15:26:00 +1000 debian/compat0000644000000000000000000000000211772165245010376 0ustar 8 debian/watch0000644000000000000000000000011511772165304010222 0ustar version=3 https://github.com/CloudMade/Leaflet/tags .*/tarball/v?(\d[\d\.]+) debian/copyright0000644000000000000000000000512411772165304011131 0ustar Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?view=co&rev=174 Upstream-Name: Leaflet Source: https://github.com/CloudMade/Leaflet/ Files: * Copyright: 2010-2011 CloudMade, Vladimir Agafonkin License: BSD-2 Files: debian/* Copyright: 2011 Andrew Harvey License: BSD-2 or GPL-2+ Files: debian/rules Copyright: 2011, Andrew Harvey 2010-2011, Jonas Smedegaard License: GPL-2+ License: BSD-2 All rights reserved. . Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: . 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. . 2. 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. . 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: GPL-2+ 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 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. . You should have received a copy of the GNU General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA . On Debian systems, the full text of the GNU General Public License version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. debian/rules0000755000000000000000000000352011772165612010256 0ustar #!/usr/bin/make -f # -*- mode: makefile; coding: utf-8 -*- # Copyright 2010, 2011 Jonas Smedegaard # Copyright 2011 Andrew Harvey # 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) # 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. # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -include /usr/share/cdbs/1/rules/upstream-tarball.mk include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/rules/debhelper.mk libname = leaflet pkg = libjs-leaflet # suppress optional build-dependencies CDBS_BUILD_DEPENDS_rules_upstream-tarball = CDBS_BUILD_DEPENDS_rules_utils_copyright-check = CDBS_BUILD_DEPENDS += , node-uglify , node-jake DEB_UPSTREAM_URL = https://github.com/CloudMade/Leaflet/tarball DEB_UPSTREAM_TARBALL_BASENAME = v$(DEB_UPSTREAM_TARBALL_VERSION) # Set below to fetch snapshot of HEAD instead of tagged release #DEB_UPSTREAM_TARBALL_BASENAME = master DEB_UPSTREAM_TARBALL_DELIMITER = DEB_UPSTREAM_TARBALL_EXTENSION = DEB_UPSTREAM_RECEIVED_EXTENSION = tar.gz DEB_UPSTREAM_WGET_OPTS += --no-check-certificate DEB_UPSTREAM_TARBALL_MD5 = # Put aside upstream shipped autogenerated files during build DEB_UPSTREAM_CRUFT_MOVE = dist/leaflet.js dist/leaflet-src.js js-destdir = /usr/share/javascript/$(libname) DEB_DH_INSTALL_ARGS_$(pkg) = dist/* $(js-destdir) build/$(pkg):: jake