[Pkg-javascript-commits] [node-tap] 01/06: Remove module-foreground-child
Bastien Roucariès
rouca at moszumanska.debian.org
Thu Sep 7 09:30:09 UTC 2017
This is an automated email from the git hooks/post-receive script.
rouca pushed a commit to branch master
in repository node-tap.
commit 2f9c39f8991145c3fb6388d5461900b2ac17e2c0
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date: Fri Sep 1 23:15:11 2017 +0200
Remove module-foreground-child
---
debian/changelog | 8 +++
debian/control | 52 ++++++++--------
debian/install | 3 +-
debian/patches/module-foreground-child.patch | 88 ----------------------------
debian/patches/series | 1 -
debian/rules | 9 ++-
debian/tap | 3 +
7 files changed, 50 insertions(+), 114 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c53bf96..53b23d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+node-tap (8.0.0-5) unstable; urgency=medium
+
+ * Team upload.
+ * Use module foreground-child instead of patch.
+ * Run tap using a wrapper in order to get usage.
+
+ -- Bastien Roucariès <rouca at debian.org> Fri, 01 Sep 2017 14:31:56 +0200
+
node-tap (8.0.0-4) unstable; urgency=medium
* Build reproducibility: do not use dh_fixperms -X
diff --git a/debian/control b/debian/control
index 37078df..607d993 100644
--- a/debian/control
+++ b/debian/control
@@ -6,17 +6,23 @@ Uploaders: Jérémy Lal <kapouer at melix.org>
Build-Depends:
debhelper (>= 9)
, dh-buildinfo
- , help2man
- , node-debug
- , node-diff
- , node-glob
- , node-js-yaml
- , node-signal-exit
- , node-strip-ansi
- , node-supports-color
- , node-isexe
- , node-tap-parser
, nodejs
+ , dpkg-dev (>= 1.17.14)
+ , help2man <!nodoc>
+ , node-supports-color <!nocheck> <!nodoc>
+ , node-foreground-child (>= 1.3.3) <!nocheck> <!nodoc>
+ , node-glob (>= 7) <!nocheck> <!nodoc>
+ , node-isexe (>= 1.0) <!nocheck> <!nodoc>
+ , node-js-yaml (>= 3.3.1) <!nocheck> <!nodoc>
+ , node-debug <!nocheck> <!nodoc>
+ , node-inherits <!nocheck> <!nodoc>
+ , node-diff <!nocheck> <!nodoc>
+ , node-escape-string-regexp <!nocheck> <!nodoc>
+ , node-strip-ansi <!nocheck> <!nodoc>
+ , node-signal-exit (>= 3.0.0) <!nocheck> <!nodoc>
+ , node-tap-parser (>= 2.2.0) <!nocheck> <!nodoc>
+ , node-tmatch (>= 3.0.0) <!nocheck> <!nodoc>
+ , node-mkdirp (>= 0.5.0)
Standards-Version: 3.9.8
Homepage: https://github.com/isaacs/node-tap
Vcs-Git: https://anonscm.debian.org/git/pkg-javascript/node-tap.git
@@ -28,23 +34,23 @@ Architecture: all
Depends:
${misc:Depends}
, nodejs
- , node-glob
- , node-escape-string-regexp
+ , node-supports-color
+ , node-foreground-child (>= 1.3.3)
+ , node-glob (>= 7)
+ , node-isexe (>= 1.0)
+ , node-js-yaml (>= 3.3.1)
, node-debug
- , node-js-yaml
- , node-mkdirp
, node-inherits
- , node-signal-exit
- , node-supports-color
- , node-isexe
- , node-strip-ansi
, node-diff
- , node-tmatch
- , node-tap-parser
+ , node-escape-string-regexp
+ , node-strip-ansi
+ , node-signal-exit (>= 3.0.0)
+ , node-tap-parser (>= 2.2.0)
+ , node-tmatch (>= 3.0.0)
Suggests:
- node-coveralls
- , node-nyc
- , node-opener
+ node-coveralls (>= 2.11.2)
+ , node-nyc (>= 7.1)
+ , node-opener (>= 1.4.1)
Description: Test-Anything-Protocol module for Node.js
Utilities for writing test harnesses complying with TAP output format.
.
diff --git a/debian/install b/debian/install
index b4390f6..fb89986 100644
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,5 @@
package.json usr/lib/nodejs/tap/
-bin/run.js usr/lib/nodejs/tap/bin/
+bin/* usr/lib/nodejs/tap/bin/
lib usr/lib/nodejs/tap/
node_modules usr/lib/nodejs/tap/
+debian/tap bin/
\ No newline at end of file
diff --git a/debian/patches/module-foreground-child.patch b/debian/patches/module-foreground-child.patch
deleted file mode 100644
index 63ec5bd..0000000
--- a/debian/patches/module-foreground-child.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Description: module foreground-child
- see copyright for more information
-Last-Update: 2016-11-11
-Forwarded: not-needed
-Author: Jérémy Lal <kapouer at melix.org>
---- /dev/null
-+++ b/node_modules/foreground-child.js
-@@ -0,0 +1,80 @@
-+var signalExit = require('signal-exit')
-+var spawn = require('child_process').spawn
-+if (process.platform === 'win32') {
-+ spawn = require('cross-spawn')
-+}
-+
-+module.exports = function (program, args, cb) {
-+ var arrayIndex = arguments.length
-+
-+ if (typeof args === 'function') {
-+ cb = args
-+ args = undefined
-+ } else {
-+ cb = Array.prototype.slice.call(arguments).filter(function (arg, i) {
-+ if (typeof arg === 'function') {
-+ arrayIndex = i
-+ return true
-+ }
-+ })[0]
-+ }
-+
-+ cb = cb || function (done) {
-+ return done()
-+ }
-+
-+ if (Array.isArray(program)) {
-+ args = program.slice(1)
-+ program = program[0]
-+ } else if (!Array.isArray(args)) {
-+ args = [].slice.call(arguments, 1, arrayIndex)
-+ }
-+
-+ var spawnOpts = { stdio: [0, 1, 2] }
-+
-+ if (process.send) {
-+ spawnOpts.stdio.push('ipc')
-+ }
-+
-+ var child = spawn(program, args, spawnOpts)
-+
-+ var childExited = false
-+ signalExit(function (code, signal) {
-+ child.kill(signal || 'SIGHUP')
-+ })
-+
-+ child.on('close', function (code, signal) {
-+ // Allow the callback to inspect the child’s exit code and/or modify it.
-+ process.exitCode = signal ? 128 + signal : code
-+
-+ cb(function () {
-+ childExited = true
-+ if (signal) {
-+ // If there is nothing else keeping the event loop alive,
-+ // then there's a race between a graceful exit and getting
-+ // the signal to this process. Put this timeout here to
-+ // make sure we're still alive to get the signal, and thus
-+ // exit with the intended signal code.
-+ setTimeout(function () {}, 200)
-+ process.kill(process.pid, signal)
-+ } else {
-+ // Equivalent to process.exit() on Node.js >= 0.11.8
-+ process.exit(process.exitCode)
-+ }
-+ })
-+ })
-+
-+ if (process.send) {
-+ process.removeAllListeners('message')
-+
-+ child.on('message', function (message, sendHandle) {
-+ process.send(message, sendHandle)
-+ })
-+
-+ process.on('message', function (message, sendHandle) {
-+ child.send(message, sendHandle)
-+ })
-+ }
-+
-+ return child
-+}
diff --git a/debian/patches/series b/debian/patches/series
index d084c77..7042688 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-module-foreground-child.patch
module-tap-mocha-reporter.patch
module-stack-utils.patch
module-clean-yaml-object.patch
diff --git a/debian/rules b/debian/rules
index d487c5d..46a1a88 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,11 +9,18 @@
override_dh_fixperms:
dh_fixperms
- chmod +x debian/node-tap/usr/lib/nodejs/tap/bin/run.js
+ chmod a+x debian/node-tap/usr/lib/nodejs/tap/bin/run.js
override_dh_installman:
+ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)))
help2man -N -n "Test-Anything-Protocol module for Node.js" --no-discard-stderr bin/run.js -o debian/tap.1
dh_installman
+else
+ @echo '**********************************************************'
+ @echo 'Skip test suite '
+ @echo '**********************************************************'
+endif
+
override_dh_auto_clean:
dh_auto_clean
diff --git a/debian/tap b/debian/tap
new file mode 100755
index 0000000..f90656a
--- /dev/null
+++ b/debian/tap
@@ -0,0 +1,3 @@
+#!/bin/sh
+# need a wrapper in order to find usage
+exec /usr/lib/nodejs/tap/bin/run.js "$@"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-tap.git
More information about the Pkg-javascript-commits
mailing list