[Pkg-javascript-commits] [node-iscroll] 04/07: Refresh patches

[Balint Reczey]

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

rbalint pushed a commit to branch master
in repository node-iscroll.

commit c4cf94ff5360c374f851f9fe29811dd4a34eba94
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Sun Aug 24 19:31:33 2014 +0200

    Refresh patches
---
 debian/patches/01_dont_use_jshint.patch | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/debian/patches/01_dont_use_jshint.patch b/debian/patches/01_dont_use_jshint.patch
index 143560e..ec1a16c 100644
--- a/debian/patches/01_dont_use_jshint.patch
+++ b/debian/patches/01_dont_use_jshint.patch
@@ -1,3 +1,5 @@
+Don't use JSHint and glify during the builddiff --git a/build.js b/build.js
+index 10e539b..ac9f710 100755
 --- a/build.js
 +++ b/build.js
 @@ -2,7 +2,7 @@
@@ -9,7 +11,7 @@
  var uglify = require('uglify-js');
  
  var banner = '/*! iScroll v' + pkg.version + ' ~ (c) 2008-' + (new Date().getFullYear()) + ' Matteo Spinelli ~ http://cubiq.org/license */\n';
-@@ -137,8 +137,8 @@
+@@ -137,8 +137,8 @@ function build (release) {
  	var buildFile = './build/iscroll' + (release != 'iscroll' ? '-' + release : '') + '.js';
  	fs.writeFileSync(buildFile, out);
  
@@ -20,23 +22,32 @@
  		var lines = out.split('\n');
  		hint.errors.forEach(function (err) {
  			console.log('\033[31m[' + err.code + ']\033[0m ' + err.line + ':' + err.character + '\t- ' + err.reason);
-@@ -150,6 +150,6 @@
+@@ -150,7 +150,7 @@ function build (release) {
  
  	// Write dist file
  	var distFile = buildFile.replace('/build/', '/dist/').replace('.js', '-min.js');
 -	out = uglify.minify(out, { fromString: true });
--	fs.writeFileSync(distFile, banner + out.code);
 +//	out = uglify.minify(out, { fromString: true });
+ 
+ 	// Make sure dist folder exists
+ 	if ( !fs.existsSync('dist') ) {
+@@ -158,5 +158,5 @@ function build (release) {
+ 	}
+ 
+ 	// Write files to target
+-	fs.writeFileSync(distFile, banner + out.code);
 +	fs.writeFileSync(distFile, banner + out);
  }
+diff --git a/package.json b/package.json
+index f74fa11..275b325 100644
 --- a/package.json
 +++ b/package.json
 @@ -15,7 +15,6 @@
    ],
    "main": "build/iscroll.js",
    "devDependencies": {
--    "jshint": "~2.3.0",
-     "uglify-js": "~2.4.7"
+-    "jshint": "~2.5.1",
+     "uglify-js": "~2.4.13"
    },
    "repository": {
 @@ -26,4 +25,4 @@

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