[Pkg-osm-commits] [SCM] leaflet branch, master, updated. debian/0.3-1-11-g0a22d3a

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit a62b0f9b152d22d72dc9593d2259acaa9ca1fcc8
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Jun 21 19:57:05 2012 +0200

    Refresh patch 01, and simplify to minimally needed.

diff --git a/debian/patches/01-dont_test_during_build.diff b/debian/patches/01-dont_test_during_build.diff
index 77fd223..c7dfe81 100644
--- a/debian/patches/01-dont_test_during_build.diff
+++ b/debian/patches/01-dont_test_during_build.diff
@@ -1,41 +1,18 @@
 --- a/Jakefile.js
 +++ b/Jakefile.js
-@@ -1,29 +1,12 @@
--var build = require('./build/build.js'),
+@@ -1,5 +1,5 @@
+ var build = require('./build/build.js'),
 -	lint = require('./build/hint.js');
-+var build = require('./build/build.js');
++	lint = null;
  
  var crlf = '\r\n',
  	COPYRIGHT = '/*' + crlf + ' Copyright (c) 2010-2011, CloudMade, Vladimir Agafonkin' + crlf +
-                 ' Leaflet is a modern open-source JavaScript library for interactive maps.' + crlf +
-                 ' http://leaflet.cloudmade.com' + crlf + '*/' + crlf;
+@@ -23,7 +23,7 @@
+ });
  
--desc('Check Leaflet source for errors with JSHint');
--task('lint', function () {
--	var files = build.getFiles();
--	
--	console.log('Checking for JS errors...');
--	
--	var errorsFound = lint.jshint(files);
--	
--	if (errorsFound > 0) {
--		console.log(errorsFound + ' error(s) found.\n');
--		fail();
--	} else {
--		console.log('\tCheck passed');
--	}
--});
--
  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';
-@@ -62,4 +45,4 @@
- 	}
- });
- 
--task('default', ['build']);
-\ No newline at end of file
-+task('default', ['build']);

-- 
JavaScript library for displaying map data in web browsers