[Pkg-osm-commits] [SCM] leaflet branch, master, updated. debian/0.5.1-1-2440-gc0c91ef
The following commit has been merged in the master branch: commit ec20726bd762c4046702e12ca7dd46b9c7b6d678 Author: Jonas Smedegaard d...@jones.dk Date: Thu Jun 27 00:27:40 2013 +0200 Stop tracking md5sum of upstream tarball. diff --git a/debian/rules b/debian/rules index add215c..1dff43b 100755 --- a/debian/rules +++ b/debian/rules @@ -28,7 +28,6 @@ CDBS_BUILD_DEPENDS += , node-uglify , node-jake DEB_UPSTREAM_URL = https://github.com/Leaflet/Leaflet/archive DEB_UPSTREAM_TARBALL_BASENAME = v$(DEB_UPSTREAM_TARBALL_VERSION) -DEB_UPSTREAM_TARBALL_MD5 = ac54371aa1db3ac51255f5247e113469 # Skip checking some images (in addition to the defaults) DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^(dist/images/(layers|marker-icon@2x)\.png|debian/(changelog|copyright(|_hints|_newhints)))$ -- 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
[Pkg-osm-commits] [SCM] leaflet branch, master, updated. debian/0.5.1-1-2440-gc0c91ef
The following commit has been merged in the master branch: commit 028ea0ab9785171e117fd2e27c5a6d50b5032de3 Author: Jonas Smedegaard d...@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 christ...@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 t...@vision-media.ca + 2011 Aseem Kishore aseem.kish...@gmail.com + 2011 Guillermo Rauch guille...@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.harv...@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 ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] leaflet branch, master, updated. debian/0.5.1-1-2440-gc0c91ef
The following commit has been merged in the master branch: commit 182a10ef356f7864d84b8db174ea05c294c0f546 Merge: ec20726bd762c4046702e12ca7dd46b9c7b6d678 05b1eda46111ef20ed5fa680bb9b4d545d780cbf Author: Jonas Smedegaard d...@jones.dk Date: Thu Jun 27 00:28:19 2013 +0200 Merge tag 'upstream/0.6' Upstream version 0.6 # gpg: Signature made tor 27 jun 2013 00:28:15 CEST # gpg:using RSA key 0x4EC1B722374F9BD6 # gpg: Good signature from Jonas Smedegaard d...@jones.dk # gpg: aka Jonas Smedegaard jo...@homebase.dk # gpg: aka Jonas Smedegaard j...@debian.org # gpg: aka Jonas Smedegaard jo...@dgi-huset.dk # gpg: aka Jonas Smedegaard jo...@107b.dk # gpg: aka [jpeg image of size 4165] -- 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
[Pkg-osm-commits] [SCM] leaflet branch, master, updated. debian/0.5.1-1-2440-gc0c91ef
The following commit has been merged in the master branch: commit f309eb9f565ae23d66d40220ecbaf34efa353743 Author: Jonas Smedegaard d...@jones.dk Date: Thu Jun 27 01:46:53 2013 +0200 Add NEWS entry listing backwards-incompatible changes. diff --git a/debian/NEWS b/debian/NEWS index aa16702..2dcfb7d 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,3 +1,15 @@ +leaflet (0.6-1) unstable; urgency=low + + * This release includes the following backwards-incompatible changes: + ++ Moved polyline editing code into Leaflet.draw plugin (where it + fits much better along with all other editing and drawing + handlers). The API remains the same. ++ Dropped support for environments that augment 'Object.prototype' + (luckily it's a thing of the past nowadays). + + -- Jonas Smedegaard d...@jones.dk Thu, 27 Jun 2013 01:44:42 +0200 + leaflet (0.5-1) unstable; urgency=low * This release includes the following backwards-incompatible changes: -- 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
[Pkg-osm-commits] [SCM] leaflet branch, master, updated. debian/0.5.1-1-2440-gc0c91ef
The following commit has been merged in the master branch:
commit ca72a714d1e54af4ea2beb57a64fa5a638a8b424
Author: Jonas Smedegaard d...@jones.dk
Date: Thu Jun 27 02:06:34 2013 +0200
Unfuzz patches.
diff --git a/debian/patches/2001-dont_test_during_build.patch
b/debian/patches/2001-dont_test_during_build.patch
index ac98838..8e3d366 100644
--- a/debian/patches/2001-dont_test_during_build.patch
+++ b/debian/patches/2001-dont_test_during_build.patch
@@ -5,14 +5,15 @@ Last-Update: 2013-01-19
--- a/Jakefile.js
+++ b/Jakefile.js
-@@ -18,6 +18,6 @@
+@@ -18,7 +18,7 @@
task('lint', build.lint);
desc('Combine and compress Leaflet source files');
-task('build', ['lint'], build.build);
+task('build', build.build);
- task('default', ['build']);
+ desc('Run PhantomJS tests');
+ task('test', ['lint'], build.test);
--- a/build/build.js
+++ b/build/build.js
@@ -1,5 +1,4 @@
diff --git a/debian/patches/2002_use_old_uglifyjs.patch
b/debian/patches/2002_use_old_uglifyjs.patch
index 34c60b2..a64c2b8 100644
--- a/debian/patches/2002_use_old_uglifyjs.patch
+++ b/debian/patches/2002_use_old_uglifyjs.patch
@@ -5,9 +5,9 @@ Last-Update: 2013-01-19
--- a/build/build.js
+++ b/build/build.js
-@@ -63,6 +63,17 @@
- return files;
- }
+@@ -64,6 +64,17 @@
+
+ exports.getFiles = getFiles;
+function uglify(code) {
+ var pro = UglifyJS.uglify;
@@ -23,7 +23,7 @@ Last-Update: 2013-01-19
exports.lint = function () {
var files = getFiles();
-@@ -137,10 +148,7 @@
+@@ -138,10 +149,7 @@
var path = pathPart + '.js',
oldCompressed = loadSilently(path),
--
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
