openkylin
/
node-bluebird
mirror of https://gitee.com/openkylin/node-bluebird.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

format patches

This commit is contained in:
zhouganqing 2023-02-17 11:33:41 +08:00
parent 37dd491806
commit 41cb0c591b
4 changed files with 57 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
debian/patches/drop-cross-spawn.diff vendored
View File

@ -1,9 +1,17 @@
Description: drop dependency to node-cross-spawn
Author: Xavier Guimard <yadd@debian.org>
From: Xavier Guimard <yadd@debian.org>
Date: Fri, 17 Feb 2023 11:33:41 +0800
Subject: drop dependency to node-cross-spawn
Bug-Debian: https://bugs.debian.org/959788
Forwarded: not-needed
Last-Update: 2020-05-05
---
package.json | 1 -
tools/utils.js | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/package.json b/package.json
index 33f696c..29077d6 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,6 @@
@ -14,6 +22,8 @@ Last-Update: 2020-05-05
"glob": "^4.3.2",
"grunt-saucelabs": "~8.4.1",
"highland": "^2.3.0",
diff --git a/tools/utils.js b/tools/utils.js
index d082a4f..fd313c9 100755
--- a/tools/utils.js
+++ b/tools/utils.js
@@ -1,7 +1,7 @@

20
debian/patches/fix-for-mkdirp-1.diff vendored
View File

@ -1,11 +1,19 @@
Description: fix for mkdirp ≥ 1
Author: Xavier Guimard <yadd@debian.org>
From: Xavier Guimard <yadd@debian.org>
Date: Fri, 17 Feb 2023 11:33:41 +0800
Subject: =?utf-8?q?fix_for_mkdirp_=E2=89=A5_1?=
Forwarded: <no|not-needed|url proving that it has been forwarded>
Last-Update: 2020-10-23
---
tools/build.js | 4 ++--
tools/test.js | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/build.js b/tools/build.js
index d65375b..4c3ec6f 100644
--- a/tools/build.js
+++ b/tools/build.js
@@ -5,7 +5,7 @@
@@ -5,7 +5,7 @@ Promise.longStackTraces();
var utils = require("./utils.js");
var glob = Promise.promisify(require("glob"));
var fs = Promise.promisifyAll(require("fs"));
@ -14,7 +22,7 @@ Last-Update: 2020-10-23
var rimraf = Promise.promisify(require("rimraf"));
jobRunner.init(path.join(__dirname, ".."), function() {
@@ -124,7 +124,7 @@
@@ -124,7 +124,7 @@ function getSourcePaths(features) {
function ensureDirectory(dir, isUsed, clean) {
return (clean ? rimraf(dir) : Promise.resolve()).then(function() {
if (!isUsed) return dir;
@ -23,9 +31,11 @@ Last-Update: 2020-10-23
});
}
diff --git a/tools/test.js b/tools/test.js
index 27f5355..d4a303d 100644
--- a/tools/test.js
+++ b/tools/test.js
@@ -8,7 +8,7 @@
@@ -8,7 +8,7 @@ var tableLogger = utils.tableLogger;
var argv = require("optimist").argv;
var glob = Promise.promisify(require("glob"));
var path = require("path");

13
debian/patches/fix-test-for-autopkgtest.diff vendored
View File

@ -1,11 +1,18 @@
Description: disable bad check for autopkgtest
Author: Xavier Guimard <yadd@debian.org>
From: Xavier Guimard <yadd@debian.org>
Date: Fri, 17 Feb 2023 11:33:41 +0800
Subject: disable bad check for autopkgtest
Forwarded: not-needed
Last-Update: 2020-01-09
---
tools/build.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/build.js b/tools/build.js
index 97df510..d65375b 100644
--- a/tools/build.js
+++ b/tools/build.js
@@ -254,10 +254,10 @@
@@ -254,10 +254,10 @@ function buildBrowser(sources, dir, tmpDir, depsRequireCode, minify, npmPackage,
var root = process.cwd();
// Since rm -rf is called, better be sure...

32
debian/patches/fix_root_dir.patch vendored
View File

@ -1,17 +1,25 @@
Description: Avoid error for incorrect root directory
Avoid error for incorrect root directory. Test/build.js expects
"bluebird". When building in Debian, the root directory
changes (e.g. node-bluebird-3.4.6). Although this should not matter for
Debian (the check is probably just in case a developer tries to
run the tests outside of the root directory), this patch checks that
at least the first 13 characters of the root directory contain
"node-bluebird".
Author: Ross Gammon <rossgammon@mail.dk>
From: Ross Gammon <rossgammon@mail.dk>
Date: Fri, 17 Feb 2023 11:33:41 +0800
Subject: Avoid error for incorrect root directory
Forwarded: not-needed
--- node-bluebird.orig/tools/build.js
+++ node-bluebird/tools/build.js
@@ -254,7 +254,7 @@
Avoid error for incorrect root directory. Test/build.js expects
"bluebird". When building in Debian, the root directory
changes (e.g. node-bluebird-3.4.6). Although this should not matter for
Debian (the check is probably just in case a developer tries to
run the tests outside of the root directory), this patch checks that
at least the first 13 characters of the root directory contain
"node-bluebird".
---
tools/build.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/build.js b/tools/build.js
index 721f513..97df510 100644
--- a/tools/build.js
+++ b/tools/build.js
@@ -254,7 +254,7 @@ function buildBrowser(sources, dir, tmpDir, depsRequireCode, minify, npmPackage,
var root = process.cwd();
// Since rm -rf is called, better be sure...