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

[Jérémy Lal]

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

kapouer pushed a commit to branch master
in repository node-mocha.

commit 482a7c7cea7b64a8aa05ad284643d70f62306503
Author: Jérémy Lal <kapouer at melix.org>
Date:   Mon Apr 11 23:55:03 2016 +0200

    Refresh patches
---
 debian/patches/0001_makefile.patch                 | 29 ++--------------------
 .../patches/0003_image_and_css_in_usr_share.patch  | 10 ++++----
 2 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/debian/patches/0001_makefile.patch b/debian/patches/0001_makefile.patch
index 5f7141b..72d6452 100644
--- a/debian/patches/0001_makefile.patch
+++ b/debian/patches/0001_makefile.patch
@@ -1,10 +1,4 @@
 Description: Fix Makefile issues:
- * Fix: "No rule to make target":
-   - node_modules/diff/diff.js
-   - node_modules/escape-string-regexp/index.js
-   - test/regression/issue1327/case.js
- * Do not copy diff.js from local module installation,
-   use to node-diff module file instead
  * Fix node binary call to nodejs
  * Disable colors (pass option -C)
 Author: Leo Iannacone <l3on at ubuntu.com>
@@ -16,27 +10,8 @@ Forwarded: not-needed
 
 --- a/Makefile
 +++ b/Makefile
-@@ -6,14 +6,14 @@
- 
- all: mocha.js
- 
--lib/browser/diff.js: node_modules/diff/diff.js
--	cp node_modules/diff/diff.js lib/browser/diff.js
-+lib/browser/diff.js:
-+	cp $(shell nodejs -e "console.log(require.resolve('diff'))") lib/browser/diff.js
- 
--lib/browser/escape-string-regexp.js: node_modules/escape-string-regexp/index.js
-+lib/browser/escape-string-regexp.js:
- 	cp node_modules/escape-string-regexp/index.js lib/browser/escape-string-regexp.js
- 
- mocha.js: $(SRC) $(SUPPORT) lib/browser/diff.js lib/browser/escape-string-regexp.js
--	@node support/compile $(SRC)
-+	@nodejs support/compile $(SRC)
- 	@cat \
- 	  support/head.js \
- 	  _mocha.js \
-@@ -39,10 +39,10 @@
- test-all: test-bdd test-tdd test-qunit test-exports test-unit test-integration test-jsapi test-compilers test-glob test-requires test-reporters test-only
+@@ -38,10 +38,10 @@
+ test-all: lint test-bdd test-tdd test-qunit test-exports test-unit test-integration test-jsapi test-compilers test-glob test-requires test-reporters test-only
  
  test-jsapi:
 -	@node test/jsapi
diff --git a/debian/patches/0003_image_and_css_in_usr_share.patch b/debian/patches/0003_image_and_css_in_usr_share.patch
index c0dd1db..33edee6 100644
--- a/debian/patches/0003_image_and_css_in_usr_share.patch
+++ b/debian/patches/0003_image_and_css_in_usr_share.patch
@@ -10,7 +10,7 @@ Forwarded: not-needed
 
 --- a/bin/_mocha
 +++ b/bin/_mocha
-@@ -52,8 +52,8 @@
+@@ -49,8 +49,8 @@
   */
  
  var images = {
@@ -21,7 +21,7 @@ Forwarded: not-needed
  };
  
  // options
-@@ -109,7 +109,7 @@
+@@ -112,7 +112,7 @@
    .action(function(path){
      var mkdir = require('mkdirp');
      mkdir.sync(path);
@@ -32,11 +32,11 @@ Forwarded: not-needed
      fs.writeFileSync(join(path, 'mocha.css'), css);
 --- a/lib/mocha.js
 +++ b/lib/mocha.js
-@@ -51,7 +51,7 @@
+@@ -50,7 +50,7 @@
+  * @return {string}
   */
- 
  function image(name) {
--  return __dirname + '/../images/' + name + '.png';
+-  return path.join(__dirname, '../images', name + '.png');
 +  return '/usr/share/javascript/mocha/images/' + name + '.png';
  }
  

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