[Pkg-javascript-commits] [node-mocha] 04/08: remove patches not needed
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Mon Dec 11 18:52:33 UTC 2017
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository node-mocha.
commit eeb5f3eafbeaab7594f5825c90f0637d4bf60d31
Author: Pirate Praveen <praveen at debian.org>
Date: Mon Dec 11 23:41:51 2017 +0530
remove patches not needed
---
debian/patches/0001_makefile.patch | 25 --
debian/patches/0002_fix_node_shebang.patch | 25 --
.../patches/0003_image_and_css_in_usr_share.patch | 18 +-
.../patches/0004-bundle_escape-string-regexp.patch | 179 -------------
debian/patches/0005-test-ports.patch | 19 --
debian/patches/0006_bundle_supports-color.patch | 279 ---------------------
debian/patches/series | 5 -
7 files changed, 9 insertions(+), 541 deletions(-)
diff --git a/debian/patches/0001_makefile.patch b/debian/patches/0001_makefile.patch
deleted file mode 100644
index 72d6452..0000000
--- a/debian/patches/0001_makefile.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix Makefile issues:
- * Fix node binary call to nodejs
- * Disable colors (pass option -C)
-Author: Leo Iannacone <l3on at ubuntu.com>
-Forwarded: not-needed
-
----
- Makefile | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -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
-+ @nodejs test/jsapi
-
- test-unit:
-- @./bin/mocha \
-+ @./bin/mocha -C \
- --reporter $(REPORTER) \
- test/acceptance/*.js \
- --growl \
diff --git a/debian/patches/0002_fix_node_shebang.patch b/debian/patches/0002_fix_node_shebang.patch
deleted file mode 100644
index 935a56a..0000000
--- a/debian/patches/0002_fix_node_shebang.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix nodejs shebang
-Author: Leo Iannacone <l3on at ubuntu.com>
-Forwarded: not-needed
-
----
- bin/_mocha | 2 +-
- bin/mocha | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/bin/_mocha
-+++ b/bin/_mocha
-@@ -1,4 +1,4 @@
--#!/usr/bin/env node
-+#!/usr/bin/env nodejs
-
- /**
- * Module dependencies.
---- a/bin/mocha
-+++ b/bin/mocha
-@@ -1,4 +1,4 @@
--#!/usr/bin/env node
-+#!/usr/bin/env nodejs
-
- /**
- * This tiny wrapper file checks for known node flags and appends them
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 33edee6..ede2d5d 100644
--- a/debian/patches/0003_image_and_css_in_usr_share.patch
+++ b/debian/patches/0003_image_and_css_in_usr_share.patch
@@ -10,19 +10,19 @@ Forwarded: not-needed
--- a/bin/_mocha
+++ b/bin/_mocha
-@@ -49,8 +49,8 @@
+@@ -53,8 +53,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'
+- fail: path.join(__dirname, '..', 'images', 'error.png'),
+- pass: path.join(__dirname, '..', 'images', 'ok.png')
++ fail: '/usr/share/javascript/mocha/images/error.png',
++ pass: '/usr/share/javascript/mocha/images/ok.png'
};
// options
-@@ -112,7 +112,7 @@
- .action(function(path){
+@@ -126,7 +126,7 @@
+ .action(function (path) {
var mkdir = require('mkdirp');
mkdir.sync(path);
- var css = fs.readFileSync(join(__dirname, '..', 'mocha.css'));
@@ -32,10 +32,10 @@ Forwarded: not-needed
fs.writeFileSync(join(path, 'mocha.css'), css);
--- a/lib/mocha.js
+++ b/lib/mocha.js
-@@ -50,7 +50,7 @@
+@@ -52,7 +52,7 @@
* @return {string}
*/
- function image(name) {
+ function image (name) {
- return path.join(__dirname, '../images', name + '.png');
+ return '/usr/share/javascript/mocha/images/' + name + '.png';
}
diff --git a/debian/patches/0004-bundle_escape-string-regexp.patch b/debian/patches/0004-bundle_escape-string-regexp.patch
deleted file mode 100644
index 153b061..0000000
--- a/debian/patches/0004-bundle_escape-string-regexp.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-Description: Bundle escape-string-regexp - right now it is too small and
- really only reverse depends on mocha.
- Origin: https://github.com/sindresorhus/escape-string-regexp
- Version: 1.0.2
-Author: Leo Iannacone <l3on at ubuntu.com>
-Forwarded: not-needed
-Last-Update: 20>
-
----
- node_modules/escape-string-regexp/.editorconfig | 16 ++++++++++
- node_modules/escape-string-regexp/.jshintrc | 13 ++++++++
- node_modules/escape-string-regexp/.travis.yml | 5 +++
- node_modules/escape-string-regexp/index.js | 11 +++++++
- node_modules/escape-string-regexp/license | 21 ++++++++++++++
- node_modules/escape-string-regexp/package.json | 36 ++++++++++++++++++++++++
- node_modules/escape-string-regexp/readme.md | 27 ++++++++++++++++++
- node_modules/escape-string-regexp/test.js | 7 ++++
- 8 files changed, 136 insertions(+)
-
---- /dev/null
-+++ b/node_modules/escape-string-regexp/.editorconfig
-@@ -0,0 +1,16 @@
-+# editorconfig.org
-+root = true
-+
-+[*]
-+indent_style = tab
-+end_of_line = lf
-+charset = utf-8
-+trim_trailing_whitespace = true
-+insert_final_newline = true
-+
-+[package.json]
-+indent_style = space
-+indent_size = 2
-+
-+[*.md]
-+trim_trailing_whitespace = false
---- /dev/null
-+++ b/node_modules/escape-string-regexp/.jshintrc
-@@ -0,0 +1,13 @@
-+{
-+ "node": true,
-+ "esnext": true,
-+ "bitwise": true,
-+ "camelcase": true,
-+ "curly": true,
-+ "immed": true,
-+ "newcap": true,
-+ "noarg": true,
-+ "undef": true,
-+ "unused": "vars",
-+ "strict": true
-+}
---- /dev/null
-+++ b/node_modules/escape-string-regexp/.travis.yml
-@@ -0,0 +1,5 @@
-+language: node_js
-+node_js:
-+ - '0.8'
-+ - '0.10'
-+ - '0.11'
---- /dev/null
-+++ b/node_modules/escape-string-regexp/index.js
-@@ -0,0 +1,11 @@
-+'use strict';
-+
-+var matchOperatorsRe = /[|\\{}()[\]^$+*?.]/g;
-+
-+module.exports = function (str) {
-+ if (typeof str !== 'string') {
-+ throw new TypeError('Expected a string');
-+ }
-+
-+ return str.replace(matchOperatorsRe, '\\$&');
-+};
---- /dev/null
-+++ b/node_modules/escape-string-regexp/license
-@@ -0,0 +1,21 @@
-+The MIT License (MIT)
-+
-+Copyright (c) Sindre Sorhus <sindresorhus at gmail.com> (sindresorhus.com)
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy
-+of this software and associated documentation files (the "Software"), to deal
-+in the Software without restriction, including without limitation the rights
-+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the Software is
-+furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in
-+all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+THE SOFTWARE.
---- /dev/null
-+++ b/node_modules/escape-string-regexp/package.json
-@@ -0,0 +1,36 @@
-+{
-+ "name": "escape-string-regexp",
-+ "version": "1.0.2",
-+ "description": "Escape RegExp special characters",
-+ "license": "MIT",
-+ "repository": "sindresorhus/escape-string-regexp",
-+ "author": {
-+ "name": "Sindre Sorhus",
-+ "email": "sindresorhus at gmail.com",
-+ "url": "http://sindresorhus.com"
-+ },
-+ "engines": {
-+ "node": ">=0.8.0"
-+ },
-+ "scripts": {
-+ "test": "mocha"
-+ },
-+ "files": [
-+ "index.js"
-+ ],
-+ "keywords": [
-+ "regex",
-+ "regexp",
-+ "re",
-+ "regular",
-+ "expression",
-+ "escape",
-+ "string",
-+ "str",
-+ "special",
-+ "characters"
-+ ],
-+ "devDependencies": {
-+ "mocha": "*"
-+ }
-+}
---- /dev/null
-+++ b/node_modules/escape-string-regexp/readme.md
-@@ -0,0 +1,27 @@
-+# escape-string-regexp [](https://travis-ci.org/sindresorhus/escape-string-regexp)
-+
-+> Escape RegExp special characters
-+
-+
-+## Install
-+
-+```sh
-+$ npm install --save escape-string-regexp
-+```
-+
-+
-+## Usage
-+
-+```js
-+var escapeStringRegexp = require('escape-string-regexp');
-+
-+var escapedString = escapeStringRegexp('how much $ for a unicorn?');
-+//=> how much \$ for a unicorn\?
-+
-+new RegExp(escapedString);
-+```
-+
-+
-+## License
-+
-+MIT © [Sindre Sorhus](http://sindresorhus.com)
---- /dev/null
-+++ b/node_modules/escape-string-regexp/test.js
-@@ -0,0 +1,7 @@
-+'use strict';
-+var assert = require('assert');
-+var escapeStringRegexp = require('./');
-+
-+it('should escape RegExp special characters', function () {
-+ assert.strictEqual(escapeStringRegexp('\\ ^ $ * + ? . ( ) | { } [ ]'), '\\\\ \\^ \\$ \\* \\+ \\? \\. \\( \\) \\| \\{ \\} \\[ \\]');
-+});
diff --git a/debian/patches/0005-test-ports.patch b/debian/patches/0005-test-ports.patch
deleted file mode 100644
index de4c791..0000000
--- a/debian/patches/0005-test-ports.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: some ZNC bouncer use this port. Set a different one
- to prevent false test fails.
-Author: Leo Iannacone <l3on at ubuntu.com>
-Forwarded: not-needed
-
----
- test/http.meta.js | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/test/http.meta.js
-+++ b/test/http.meta.js
-@@ -1,6 +1,6 @@
- var http = require('http');
-
--var PORT = 8889;
-+var PORT = 8989;
-
- var server = http.createServer(function(req, res){
- var accept = req.headers.accept || ''
diff --git a/debian/patches/0006_bundle_supports-color.patch b/debian/patches/0006_bundle_supports-color.patch
deleted file mode 100644
index 4c187f6..0000000
--- a/debian/patches/0006_bundle_supports-color.patch
+++ /dev/null
@@ -1,279 +0,0 @@
-Description: Bundle supports-color - right now it is too small and
- really only reverse depends on mocha.
- Origin: https://github.com/sindresorhus/supports-color
- Version: 1.3.1
-Author: Leo Iannacone <l3on at ubuntu.com>
-Forwarded: not-needed
----
- node_modules/supports-color/cli.js | 15 +++++++
- node_modules/supports-color/index.js | 43 ++++++++++++++++++++
- node_modules/supports-color/license | 21 ++++++++++
- node_modules/supports-color/package.json | 57 +++++++++++++++++++++++++++
- node_modules/supports-color/readme.md | 46 ++++++++++++++++++++++
- node_modules/supports-color/test.js | 64 +++++++++++++++++++++++++++++++
- 6 files changed, 246 insertions(+)
-
---- /dev/null
-+++ b/node_modules/supports-color/cli.js
-@@ -0,0 +1,15 @@
-+#!/usr/bin/env node
-+'use strict';
-+var meow = require('meow');
-+var supportsColor = require('./');
-+
-+meow({
-+ help: [
-+ 'Usage',
-+ ' supports-color',
-+ '',
-+ 'Exits with code 0 if color is supported and 1 if not'
-+ ].join('\n')
-+});
-+
-+process.exit(supportsColor ? 0 : 1);
---- /dev/null
-+++ b/node_modules/supports-color/index.js
-@@ -0,0 +1,43 @@
-+'use strict';
-+var argv = process.argv;
-+
-+module.exports = (function () {
-+ if ('FORCE_COLOR' in process.env) {
-+ return true;
-+ }
-+
-+ if (argv.indexOf('--no-color') !== -1 ||
-+ argv.indexOf('--no-colors') !== -1 ||
-+ argv.indexOf('--color=false') !== -1) {
-+ return false;
-+ }
-+
-+ if (argv.indexOf('--color') !== -1 ||
-+ argv.indexOf('--colors') !== -1 ||
-+ argv.indexOf('--color=true') !== -1 ||
-+ argv.indexOf('--color=always') !== -1) {
-+ return true;
-+ }
-+
-+ if (process.stdout && !process.stdout.isTTY) {
-+ return false;
-+ }
-+
-+ if (process.platform === 'win32') {
-+ return true;
-+ }
-+
-+ if ('COLORTERM' in process.env) {
-+ return true;
-+ }
-+
-+ if (process.env.TERM === 'dumb') {
-+ return false;
-+ }
-+
-+ if (/^screen|^xterm|^vt100|color|ansi|cygwin|linux/i.test(process.env.TERM)) {
-+ return true;
-+ }
-+
-+ return false;
-+})();
---- /dev/null
-+++ b/node_modules/supports-color/license
-@@ -0,0 +1,21 @@
-+The MIT License (MIT)
-+
-+Copyright (c) Sindre Sorhus <sindresorhus at gmail.com> (sindresorhus.com)
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy
-+of this software and associated documentation files (the "Software"), to deal
-+in the Software without restriction, including without limitation the rights
-+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the Software is
-+furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in
-+all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+THE SOFTWARE.
---- /dev/null
-+++ b/node_modules/supports-color/package.json
-@@ -0,0 +1,57 @@
-+{
-+ "name": "supports-color",
-+ "version": "1.3.1",
-+ "description": "Detect whether a terminal supports color",
-+ "license": "MIT",
-+ "repository": "sindresorhus/supports-color",
-+ "author": {
-+ "name": "Sindre Sorhus",
-+ "email": "sindresorhus at gmail.com",
-+ "url": "sindresorhus.com"
-+ },
-+ "maintainers": [
-+ "Sindre Sorhus <sindresorhus at gmail.com> (sindresorhus.com)",
-+ "Joshua Appelman <jappelman at xebia.com> (jbnicolai.com)"
-+ ],
-+ "bin": "cli.js",
-+ "engines": {
-+ "node": ">=0.8.0"
-+ },
-+ "scripts": {
-+ "test": "mocha"
-+ },
-+ "files": [
-+ "index.js",
-+ "cli.js"
-+ ],
-+ "keywords": [
-+ "cli-app",
-+ "cli",
-+ "bin",
-+ "color",
-+ "colour",
-+ "colors",
-+ "terminal",
-+ "console",
-+ "cli",
-+ "ansi",
-+ "styles",
-+ "tty",
-+ "rgb",
-+ "256",
-+ "shell",
-+ "xterm",
-+ "command-line",
-+ "support",
-+ "supports",
-+ "capability",
-+ "detect"
-+ ],
-+ "dependencies": {
-+ "meow": "^3.1.0"
-+ },
-+ "devDependencies": {
-+ "mocha": "*",
-+ "require-uncached": "^1.0.2"
-+ }
-+}
---- /dev/null
-+++ b/node_modules/supports-color/readme.md
-@@ -0,0 +1,46 @@
-+# supports-color [](https://travis-ci.org/sindresorhus/supports-color)
-+
-+> Detect whether a terminal supports color
-+
-+
-+## Install
-+
-+```
-+$ npm install --save supports-color
-+```
-+
-+
-+## Usage
-+
-+```js
-+var supportsColor = require('supports-color');
-+
-+if (supportsColor) {
-+ console.log('Terminal supports color');
-+}
-+```
-+
-+It obeys the `--color` and `--no-color` CLI flags.
-+
-+For situations where using `--color` is not possible, add an environment variable `FORCE_COLOR` with any value to force color. Trumps `--no-color`.
-+
-+
-+## CLI
-+
-+```
-+$ npm install --global supports-color
-+```
-+
-+```
-+$ supports-color --help
-+
-+ Usage
-+ supports-color
-+
-+ Exits with code 0 if color is supported and 1 if not
-+```
-+
-+
-+## License
-+
-+MIT © [Sindre Sorhus](http://sindresorhus.com)
---- /dev/null
-+++ b/node_modules/supports-color/test.js
-@@ -0,0 +1,64 @@
-+'use strict';
-+var assert = require('assert');
-+var requireUncached = require('require-uncached');
-+
-+beforeEach(function () {
-+ process.stdout.isTTY = true;
-+ process.argv = [];
-+ process.env = {};
-+});
-+
-+it('should return true if `FORCE_COLOR` is in env', function () {
-+ process.env.FORCE_COLOR = true;
-+ assert.equal(requireUncached('./'), true);
-+});
-+
-+it('should return false if not TTY', function () {
-+ process.stdout.isTTY = false;
-+ assert.equal(requireUncached('./'), false);
-+});
-+
-+it('should return false if --no-color flag is used', function () {
-+ process.argv = ['--no-color'];
-+ assert.equal(requireUncached('./'), false);
-+});
-+
-+it('should return false if --no-colors flag is used', function () {
-+ process.argv = ['--no-colors'];
-+ assert.equal(requireUncached('./'), false);
-+});
-+
-+it('should return true if --color flag is used', function () {
-+ process.argv = ['--color'];
-+ assert.equal(requireUncached('./'), true);
-+});
-+
-+it('should return true if --colors flag is used', function () {
-+ process.argv = ['--colors'];
-+ assert.equal(requireUncached('./'), true);
-+});
-+
-+it('should return false if `UPSTART_JOB` is in env', function () {
-+ process.env.UPSTART_JOB = true;
-+ assert.equal(requireUncached('./'), false);
-+});
-+
-+it('should return true if `COLORTERM` is in env', function () {
-+ process.env.COLORTERM = true;
-+ assert.equal(requireUncached('./'), true);
-+});
-+
-+it('should support `--color=true` flag', function () {
-+ process.argv = ['--color=true'];
-+ assert.equal(requireUncached('./'), true);
-+});
-+
-+it('should support `--color=always` flag', function () {
-+ process.argv = ['--color=always'];
-+ assert.equal(requireUncached('./'), true);
-+});
-+
-+it('should support `--color=false` flag', function () {
-+ process.argv = ['--color=false'];
-+ assert.equal(requireUncached('./'), false);
-+});
diff --git a/debian/patches/series b/debian/patches/series
index 763558a..741cd1f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1 @@
-0001_makefile.patch
-0002_fix_node_shebang.patch
0003_image_and_css_in_usr_share.patch
-0004-bundle_escape-string-regexp.patch
-0005-test-ports.patch
-0006_bundle_supports-color.patch
--
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