[Pkg-osm-commits] [SCM] leaflet branch, master, updated. debian/0.4.5-1-21-g7f1fdf1

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit 54af272589f77f474665c6527f3c6e93629d78b9
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Jan 19 10:30:47 2013 +0100

    Minimize patch 2001 to only avoid jslint, not eradicate its use in source.

diff --git a/debian/patches/2001-dont_test_during_build.patch b/debian/patches/2001-dont_test_during_build.patch
index b323bcc..95d1f9d 100644
--- a/debian/patches/2001-dont_test_during_build.patch
+++ b/debian/patches/2001-dont_test_during_build.patch
@@ -3,84 +3,21 @@ Author: Andrew Harvey <andrew.harvey4 at gmail.com>
 Forwarded: not-needed
 Last-Update: 2013-01-19
 
---- leaflet.orig/Jakefile.js
-+++ leaflet/Jakefile.js
-@@ -5,7 +5,6 @@
+--- a/Jakefile.js
++++ b/Jakefile.js
+@@ -18,6 +18,6 @@
+ task('lint', build.lint);
  
-     npm install -g jake
-     npm install uglify-js
--    npm install jshint
- 
- To check the code and build Leaflet from source, run "jake"
- 
-@@ -14,10 +13,7 @@
- 
- var build = require('./build/build.js');
- 
--desc('Check Leaflet source for errors with JSHint');
--task('lint', build.lint);
--
  desc('Combine and compress Leaflet source files');
 -task('build', ['lint'], build.build);
-+task('build', [], build.build);
++task('build', build.build);
  
  task('default', ['build']);
---- leaflet.orig/build/build.js
-+++ leaflet/build/build.js
-@@ -1,32 +1,10 @@
+--- a/build/build.js
++++ b/build/build.js
+@@ -1,5 +1,4 @@
  var fs = require('fs'),
 -    jshint = require('jshint'),
      UglifyJS = require('uglify-js'),
  
      deps = require('./deps.js').deps,
-     hintrc = require('./hintrc.js').config;
- 
- 
--function lintFiles(files) {
--
--	var errorsFound = 0,
--	    i, j, len, len2, src, errors, e;
--
--	for (i = 0, len = files.length; i < len; i++) {
--
--		jshint.JSHINT(fs.readFileSync(files[i], 'utf8'), hintrc);
--		errors = jshint.JSHINT.errors;
--
--		for (j = 0, len2 = errors.length; j < len2; j++) {
--			e = errors[j];
--			console.log(files[i] + '\tline ' + e.line + '\tcol ' + e.character + '\t ' + e.reason);
--		}
--
--		errorsFound += len2;
--	}
--
--	return errorsFound;
--}
--
- function getFiles(compsBase32) {
- 	var memo = {},
- 	    comps;
-@@ -64,23 +42,6 @@
- 	return files;
- }
- 
--exports.lint = function () {
--
--	var files = getFiles();
--
--	console.log('Checking for JS errors...');
--
--	var errorsFound = lintFiles(files);
--
--	if (errorsFound > 0) {
--		console.log(errorsFound + ' error(s) found.\n');
--		fail();
--	} else {
--		console.log('\tCheck passed');
--	}
--};
--
--
- function getSizeDelta(newContent, oldContent) {
- 	if (!oldContent) {
- 		return 'new';

-- 
JavaScript library for displaying map data in web browsers