[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 ca72a714d1e54af4ea2beb57a64fa5a638a8b424
Author: Jonas Smedegaard <dr at 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