[Pkg-javascript-commits] [leaflet] 298/301: Unfuzz patches.

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository leaflet.

commit 5cf684b253b9ab7a5f86a1f3941b85e21a7cf2d6
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Jan 27 22:12:52 2014 +0100

    Unfuzz patches.
---
 debian/patches/2001-dont_test_during_build.patch | 13 +------------
 debian/patches/2002_use_old_uglifyjs.patch       | 12 ++++++------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/debian/patches/2001-dont_test_during_build.patch b/debian/patches/2001-dont_test_during_build.patch
index 8e3d366..fc6de50 100644
--- a/debian/patches/2001-dont_test_during_build.patch
+++ b/debian/patches/2001-dont_test_during_build.patch
@@ -3,22 +3,11 @@ Author: Andrew Harvey <andrew.harvey4 at gmail.com>
 Forwarded: not-needed
 Last-Update: 2013-01-19
 
---- a/Jakefile.js
-+++ b/Jakefile.js
-@@ -18,7 +18,7 @@
- task('lint', build.lint);
- 
- desc('Combine and compress Leaflet source files');
--task('build', ['lint'], build.build);
-+task('build', build.build);
- 
- desc('Run PhantomJS tests');
- task('test', ['lint'], build.test);
 --- a/build/build.js
 +++ b/build/build.js
 @@ -1,5 +1,4 @@
  var fs = require('fs'),
 -    jshint = require('jshint'),
      UglifyJS = require('uglify-js'),
+     zlib = require('zlib'),
  
-     deps = require('./deps.js').deps,
diff --git a/debian/patches/2002_use_old_uglifyjs.patch b/debian/patches/2002_use_old_uglifyjs.patch
index a64c2b8..578396c 100644
--- a/debian/patches/2002_use_old_uglifyjs.patch
+++ b/debian/patches/2002_use_old_uglifyjs.patch
@@ -5,7 +5,7 @@ Last-Update: 2013-01-19
 
 --- a/build/build.js
 +++ b/build/build.js
-@@ -64,6 +64,17 @@
+@@ -45,6 +45,17 @@
  
  exports.getFiles = getFiles;
  
@@ -20,10 +20,10 @@ Last-Update: 2013-01-19
 +	return pro.gen_code(ast) + ';';
 +};
 +
- exports.lint = function () {
- 
- 	var files = getFiles();
-@@ -138,10 +149,7 @@
+ function getSizeDelta(newContent, oldContent, fixCRLF) {
+ 	if (!oldContent) {
+ 		return ' (new)';
+@@ -107,10 +118,7 @@
  
  	var path = pathPart + '.js',
  	    oldCompressed = loadSilently(path),
@@ -34,4 +34,4 @@ Last-Update: 2013-01-19
 +	    newCompressed = copy + uglify(newSrc),
  	    delta = getSizeDelta(newCompressed, oldCompressed);
  
- 	console.log('\tCompressed size: ' + newCompressed.length + ' bytes (' + delta + ')');
+ 	console.log('\tCompressed: ' + bytesToKB(newCompressed.length) + delta);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/leaflet.git