[Pkg-javascript-commits] [node-bluebird] 01/15: Replay my last changes
Ross Gammon
ross-guest at moszumanska.debian.org
Sun Dec 11 20:51:57 UTC 2016
This is an automated email from the git hooks/post-receive script.
ross-guest pushed a commit to branch master
in repository node-bluebird.
commit a0a93dab093f03e9d224f72b409a455e540769a7
Author: Ross Gammon <rosco2 at ubuntu.com>
Date: Sat Nov 19 22:05:18 2016 +0100
Replay my last changes
There was an error with gbp import-orig
---
debian/README.Debian | 16 ++----
debian/README.source | 2 +-
debian/changelog | 23 --------
debian/control | 16 +-----
debian/copyright | 7 +--
debian/gbp.conf | 3 +
debian/libjs-bluebird.docs | 1 -
debian/libjs-bluebird.install | 2 -
debian/node-bluebird.docs | 3 +
debian/node-bluebird.install | 1 -
debian/patches/fix_root_dir.patch | 2 +-
debian/patches/nodejs.patch | 112 ++++----------------------------------
debian/rules | 13 +----
13 files changed, 29 insertions(+), 172 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index 23628ae..bf21a4f 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,16 +1,9 @@
To-do
-----
-1. Build the browser & minified javascript using the upstream build. This requires the following build dependencies (some not yet packaged for Debian):
--uglifyjs (already packaged as node-uglify)
--rimraf (already pckage as node-rimraf)
--optimist (already packaged as node-optimist)
--mocha (already packaged as libjs-mocha & mocha)
--mkdirp (already packaged as node-mkdirp)
--glob (already packaged as node-glob)
--cross-spawn (already packaged & in the NEW queue as node-cross-spawn)
--cli-table
+1. Build the browser & minified javascript using the upstream build. This
+requires the following build dependencies not yet packaged for Debian:
-browserify
--acorn (already packaged & in NEW queue as acorn)
+-acorn (packaging started, but abandoned)
Then the build can be executed with:
$ NODE_PATH=src nodejs tools/build.js --no-debug --main --browser --minify
@@ -18,7 +11,8 @@ $ NODE_PATH=src nodejs tools/build.js --no-debug --main --browser --minify
Note: The bluebird.js in the src directory does not work. Only a blubird.js
built with the "build.js --main" option works.
-2. Run the upstream test suite during the build. In addition to many of the dependencies needed for building, the test suite also needs:
+2. Run the upstream test suite during the build. In addition to many of the
+dependencies needed for building, the test suite also needs:
-sinon
-jshint-stylish
-jshint
diff --git a/debian/README.source b/debian/README.source
index 1b581be..96ecb71 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,6 +1,6 @@
Minimised JavaScript
====================
-
+
The upstream source of node-bluebird contained a benchmark directory
that includes a minimied javascript file called fakesSJS-dst.js. I
was not able to track down the source of this file, and as I was not
diff --git a/debian/changelog b/debian/changelog
index ea0a570..65cfa5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,28 +1,5 @@
node-bluebird (2.9.14+dfsg-1) UNRELEASED; urgency=low
- [ Ross Gammon ]
* Initial release (Closes: #779305)
- * Repack tarball to exclude minified javascript without source
- * Document repacking of tarball in d/README.source
- * Add a libjs-bluebird package for the browser js files
- * Fix duplicate package descriptions
- * Add lintian override for embedded javascript false positive
- * Create patch to set correct root directory for test/build.js
- * Unapply patches from source
-
- [ Bas Couwenberg ]
- * Restructure control file with cme.
- * Add myself to Uploaders.
- * Update Vcs-Browser URL to use cgit instead of gitweb.
- * Improve package description.
- * Regenerate bluebird.min.js from original source.
- * Install changelog.md as upstream changelog.
- * Add upstream metadata.
- * Update copyright file, changes:
- - Add all copyright holders.
- - Use capitals in Upstream-Name
- - Use upstream author as Upstream-Contact
- * Install JavaScript files under js/main/ as specified in package.json.
- * Add patch to fix nodejs executable.
-- Ross Gammon <rossgammon at mail.dk> Wed, 04 Mar 2015 21:39:49 +0100
diff --git a/debian/control b/debian/control
index 07d2c9b..45cffbb 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
Source: node-bluebird
Maintainer: Debian Javascript Maintainers <pkg-javascript-devel at lists.alioth.debian.org>
-Uploaders: Ross Gammon <rossgammon at mail.dk>
+Uploaders: Ross Gammon <rosco2 at ubuntu.com>
Section: web
-Priority: extra
+Priority: optional
Build-Depends: debhelper (>= 9),
dh-buildinfo,
nodejs,
@@ -11,7 +11,6 @@ Standards-Version: 3.9.6
Vcs-Browser: http://anonscm.debian.org/cgit/pkg-javascript/node-bluebird.git
Vcs-Git: git://anonscm.debian.org/pkg-javascript/node-bluebird.git
Homepage: https://github.com/petkaantonov/bluebird
-XS-Testsuite: autopkgtest
Package: node-bluebird
Architecture: all
@@ -24,14 +23,3 @@ Description: Fully featured Promises/A+ implementation for Node.js
This package contains the bluebird module for Node.js.
.
Node.js is an event-based server-side JavaScript engine.
-
-Package: libjs-bluebird
-Architecture: all
-Depends: ${misc:Depends}
-Recommends: javascript-common
-Description: Fully featured Promises/A+ implementation for JavaScript
- Bluebird is a fully featured Promise library with a focus on
- innovative features and performance.
- .
- This package contains the bluebird.js JavaScript file.
-
diff --git a/debian/copyright b/debian/copyright
index e7895e0..5ebf57b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,11 +2,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Bluebird
Upstream-Contact: Petka Antonov <petka_antonov at hotmail.com>
Source: https://github.com/petkaantonov/bluebird
-Files-Excluded: benchmark/*
- js/browser/bluebird.min.js
Files: *
-Copyright: 2013-2014, Petka Antonov <petka_antonov at hotmail.com> (http://github.com/petkaantonov/)
+Copyright: 2013-2016, Petka Antonov <petka_antonov at hotmail.com> (http://github.com/petkaantonov/)
2012-2014, Kit Cambridge
2009-2012, Kristopher Michael Kowal
2012, Parashuram
@@ -14,7 +12,7 @@ Copyright: 2013-2014, Petka Antonov <petka_antonov at hotmail.com> (http://github.c
License: Expat
Files: debian/*
-Copyright: 2015, Ross Gammon <rossgammon at mail.dk>
+Copyright: 2015-2016, Ross Gammon <rosco at ubuntu.com>
License: Expat
License: Expat
@@ -37,4 +35,3 @@ License: Expat
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.
-
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 21d0417..462aef2 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -14,3 +14,6 @@ upstream-tag = upstream/%(version)s
# Always use pristine-tar.
pristine-tar = True
+
+# Applies to all commands
+sign-tags = True
diff --git a/debian/libjs-bluebird.docs b/debian/libjs-bluebird.docs
deleted file mode 100644
index b43bf86..0000000
--- a/debian/libjs-bluebird.docs
+++ /dev/null
@@ -1 +0,0 @@
-README.md
diff --git a/debian/libjs-bluebird.install b/debian/libjs-bluebird.install
deleted file mode 100644
index e013eaa..0000000
--- a/debian/libjs-bluebird.install
+++ /dev/null
@@ -1,2 +0,0 @@
-js/browser/bluebird.js usr/share/javascript/bluebird/
-bluebird.min.js usr/share/javascript/bluebird/
diff --git a/debian/node-bluebird.docs b/debian/node-bluebird.docs
index b43bf86..bc25184 100644
--- a/debian/node-bluebird.docs
+++ b/debian/node-bluebird.docs
@@ -1 +1,4 @@
README.md
+API.md
+CONTRIBUTING.md
+deprecated_apis.md
diff --git a/debian/node-bluebird.install b/debian/node-bluebird.install
index 4f9825d..805f50a 100644
--- a/debian/node-bluebird.install
+++ b/debian/node-bluebird.install
@@ -1,3 +1,2 @@
-js/main/bluebird.js usr/lib/nodejs/bluebird/
src/* usr/lib/nodejs/bluebird/
package.json usr/lib/nodejs/bluebird/
diff --git a/debian/patches/fix_root_dir.patch b/debian/patches/fix_root_dir.patch
index 05ce003..ccbe72d 100644
--- a/debian/patches/fix_root_dir.patch
+++ b/debian/patches/fix_root_dir.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed
--- node-bluebird.orig/tools/build.js
+++ node-bluebird/tools/build.js
-@@ -290,7 +290,7 @@
+@@ -254,7 +254,7 @@
var root = process.cwd();
// Since rm -rf is called, better be sure...
diff --git a/debian/patches/nodejs.patch b/debian/patches/nodejs.patch
index 39c2095..2046291 100644
--- a/debian/patches/nodejs.patch
+++ b/debian/patches/nodejs.patch
@@ -2,121 +2,29 @@ Description: Switch NodeJS command from node (upstream) to nodejs (Debian).
Author: Bas Couwenberg <sebastic at debian.org>
Forwarded: not-needed
---- a/API.md
-+++ b/API.md
-@@ -1088,10 +1088,10 @@ fs.readdirAsync(".").map(function(fileNa
-
- ```bash
- $ sync && echo 3 > /proc/sys/vm/drop_caches
--$ node test.js 1
-+$ nodejs test.js 1
- reading files 35ms
- $ sync && echo 3 > /proc/sys/vm/drop_caches
--$ node test.js Infinity
-+$ nodejs test.js Infinity
- reading files: 9ms
- ```
-
---- a/README.md
-+++ b/README.md
-@@ -270,7 +270,7 @@ right after the library is loaded.
- In node.js use the environment flag `BLUEBIRD_DEBUG`:
-
- ```
--BLUEBIRD_DEBUG=1 node server.js
-+BLUEBIRD_DEBUG=1 nodejs server.js
- ```
-
- to enable long stack traces in all instances of bluebird.
-@@ -450,7 +450,7 @@ Install [node](http://nodejs.org/) and [
-
- To run all tests, run
-
-- node tools/test
-+ nodejs tools/test
-
- If you need to run generator tests run the `tool/test.js` script with `--harmony` argument and node 0.11+:
-
-@@ -458,7 +458,7 @@ If you need to run generator tests run t
-
- You may specify an individual test file to run with the `--run` script flag:
-
-- node tools/test --run=cancel.js
-+ nodejs tools/test --run=cancel.js
-
-
- This enables output from the test and may give a better idea where the test is failing. The paramter to `--run` can be any file name located in `test/mocha` folder.
-@@ -467,7 +467,7 @@ This enables output from the test and ma
-
- To run the test in a browser instead of node, pass the flag `--browser` to the test tool
-
-- node tools/test --run=cancel.js --browser
-+ nodejs tools/test --run=cancel.js --browser
-
- This will automatically create a server (default port 9999) and open it in your default browser once the tests have been compiled.
-
-@@ -545,19 +545,19 @@ Make sure you have cloned the repo somew
-
- After that you can run:
-
-- node tools/build --features="core"
-+ nodejs tools/build --features="core"
-
-
- The above builds the most minimal build you can get. You can add more features separated by spaces from the above list:
-
-- node tools/build --features="core filter map reduce"
-+ nodejs tools/build --features="core filter map reduce"
-
- The custom build file will be found from `/js/browser/bluebird.js`. It will have a comment that lists the disabled and enabled features.
-
- Note that the build leaves the `/js/main` etc folders with same features so if you use the folder for node.js at the same time, don't forget to build
- a full version afterwards (after having taken a copy of the bluebird.js somewhere):
-
-- node tools/build --debug --main --zalgo --browser --minify
-+ nodejs tools/build --debug --main --zalgo --browser --minify
-
- #### Supported options by the build tool
-
---- a/build
-+++ b/build
+--- node-bluebird.orig/build
++++ node-bluebird/build
@@ -1,2 +1,2 @@
#!/usr/bin/env bash
-node tools/build.js "$@"
+nodejs tools/build.js "$@"
---- a/package.json
-+++ b/package.json
-@@ -18,10 +18,10 @@
- "fluent interface"
- ],
- "scripts": {
-- "lint": "node scripts/jshint.js",
-- "test": "node tools/test.js",
-+ "lint": "nodejs scripts/jshint.js",
-+ "test": "nodejs tools/test.js",
- "istanbul": "istanbul",
-- "prepublish": "node tools/build.js --no-debug --main --zalgo --browser --minify"
-+ "prepublish": "nodejs tools/build.js --no-debug --main --zalgo --browser --minify"
- },
- "homepage": "https://github.com/petkaantonov/bluebird",
- "repository": {
---- a/tests
-+++ b/tests
+--- node-bluebird.orig/tests
++++ node-bluebird/tests
@@ -1,2 +1,2 @@
#!/usr/bin/env bash
-node tools/test.js "$@"
+nodejs tools/test.js "$@"
---- a/tools/README.md
-+++ b/tools/README.md
-@@ -16,4 +16,4 @@ Generates a .jshintrc file in the projec
+--- node-bluebird.orig/tools/README.md
++++ node-bluebird/tools/README.md
+@@ -16,4 +16,4 @@
Example:
- node tools/jshintrc_generator
+ nodejs tools/jshintrc_generator
---- a/tools/mocha_runner.js
-+++ b/tools/mocha_runner.js
-@@ -103,7 +103,7 @@ module.exports = function mochaRun(progr
+--- node-bluebird.orig/tools/mocha_runner.js
++++ node-bluebird/tools/mocha_runner.js
+@@ -119,7 +119,7 @@
}).then(function() {
function failAdvice(failedTestFileName) {
return "For additional details you can run it individually " +
diff --git a/debian/rules b/debian/rules
index 28e08e1..858ee36 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,17 +7,8 @@
%:
dh $@
-override_dh_clean:
- dh_clean bluebird.min.js
-
-override_dh_auto_build:
- # Minify Javascript
- uglifyjs -o bluebird.min.js js/browser/bluebird.js
-
override_dh_installchangelogs:
dh_installchangelogs changelog.md
-override_dh_install:
- # Remove bluebird.js, install only the one from the main directiory
- rm -f $(CURDIR)/src/bluebird.js
- dh_install
+override_dh_auto_test:
+ nodejs tools/test.js
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-bluebird.git
More information about the Pkg-javascript-commits
mailing list