[Pkg-javascript-commits] [node-mocha] 06/12: refresh patches

Leo Iannacone l3on-guest at moszumanska.debian.org
Wed Oct 15 18:03:14 UTC 2014


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

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

commit 21fe205564f9f4da565df18355248f7953eae0df
Author: Leo Iannacone <l3on at ubuntu.com>
Date:   Wed Oct 15 19:14:10 2014 +0200

    refresh patches
---
 debian/patches/0001_makefile.patch            | 21 +++++++++++----------
 debian/patches/0003_images_in_usr_share.patch | 15 ++++++++++-----
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/debian/patches/0001_makefile.patch b/debian/patches/0001_makefile.patch
index 6d08e04..6b90fa4 100644
--- a/debian/patches/0001_makefile.patch
+++ b/debian/patches/0001_makefile.patch
@@ -6,28 +6,29 @@ Author: Leo Iannacone <l3on at ubuntu.com>
 Forwarded: not-needed
 
 ---
- Makefile |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ Makefile |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 --- a/Makefile
 +++ b/Makefile
-@@ -6,11 +6,11 @@
- 
+@@ -7,13 +7,13 @@
  all: mocha.js
  
--lib/browser/diff.js: node_modules/diff/diff.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
++	cp $(shell nodejs -e "console.log(require.resolve('diff'))") lib/browser/diff.js lib/browser/diff.js
+ 
+ lib/browser/escape-string-regexp.js: node_modules/escape-string-regexp/index.js
+ 	cp node_modules/escape-string-regexp/index.js lib/browser/escape-string-regexp.js
  
- mocha.js: $(SRC) $(SUPPORT) lib/browser/diff.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 \
-@@ -35,7 +35,7 @@
- test-all: test-bdd test-tdd test-qunit test-exports test-unit test-grep test-jsapi test-compilers test-sort test-glob test-requires test-reporters test-only
+@@ -39,7 +39,7 @@
+ test-all: test-bdd test-tdd test-qunit test-exports test-unit test-grep test-jsapi test-compilers test-sort test-glob test-requires test-reporters test-only test-failing test-regression
  
  test-jsapi:
 -	@node test/jsapi
diff --git a/debian/patches/0003_images_in_usr_share.patch b/debian/patches/0003_images_in_usr_share.patch
index d5779e0..f8d0b97 100644
--- a/debian/patches/0003_images_in_usr_share.patch
+++ b/debian/patches/0003_images_in_usr_share.patch
@@ -3,27 +3,32 @@ Description: Install images in usr/share directory
  More info: http://lintian.debian.org/tags/image-file-in-usr-lib.html
 Author: Leo Iannacone <l3on at ubuntu.com>
 Forwarded: not-needed
+---
+ bin/_mocha   |    4 ++--
+ lib/mocha.js |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
 --- a/bin/_mocha
 +++ b/bin/_mocha
 @@ -52,8 +52,8 @@
   */
-
+ 
  var images = {
 -    fail: __dirname + '/../images/error.png'
 -  , pass: __dirname + '/../images/ok.png'
 +    fail: '/usr/share/javascript/mocha/images/error.png'
 +  , pass: '/usr/share/javascript/mocha/images/ok.png'
  };
-
+ 
  // options
 --- a/lib/mocha.js
 +++ b/lib/mocha.js
-@@ -40,7 +40,7 @@
+@@ -51,7 +51,7 @@
   */
-
+ 
  function image(name) {
 -  return __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



More information about the Pkg-javascript-commits mailing list