[Pkg-javascript-commits] [node-bluebird] 01/16: Fix package.json after previous merge error

[Ross Gammon]

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 f056278b03a52b706792b122c1a37fdc1bcc93da
Author: Ross Gammon <rosco2 at ubuntu.com>
Date:   Sun Oct 15 09:31:06 2017 +0200

    Fix package.json after previous merge error
---
 debian/node-modules/bluebird/package.json | 141 ++++++++++++------------------
 1 file changed, 57 insertions(+), 84 deletions(-)

diff --git a/debian/node-modules/bluebird/package.json b/debian/node-modules/bluebird/package.json
index 1fbbb09..973bdfb 100644
--- a/debian/node-modules/bluebird/package.json
+++ b/debian/node-modules/bluebird/package.json
@@ -1,53 +1,44 @@
 {
-  "_args": [
-    [
-      "bluebird at 3.5.1",
-      "/home/ross/debian/node-bluebird"
-    ]
+  "name": "bluebird",
+  "description": "Full featured Promises/A+ implementation with exceptionally good performance",
+  "version": "3.5.1",
+  "keywords": [
+    "promise",
+    "performance",
+    "promises",
+    "promises-a",
+    "promises-aplus",
+    "async",
+    "await",
+    "deferred",
+    "deferreds",
+    "future",
+    "flow control",
+    "dsl",
+    "fluent interface"
   ],
-  "_from": "bluebird at 3.5.1",
-  "_id": "bluebird at 3.5.1",
-  "_inCache": true,
-  "_installable": true,
-  "_location": "/bluebird",
-  "_nodeVersion": "8.0.0",
-  "_npmOperationalInternal": {
-    "host": "s3://npm-registry-packages",
-    "tmp": "tmp/bluebird-3.5.1.tgz_1507132268699_0.46325381100177765"
+  "scripts": {
+    "lint": "node scripts/jshint.js",
+    "test": "node tools/test.js",
+    "istanbul": "istanbul",
+    "prepublish": "npm run generate-browser-core && npm run generate-browser-full",
+    "generate-browser-full": "node tools/build.js --no-clean --no-debug --release --browser --minify",
+    "generate-browser-core": "node tools/build.js --features=core --no-debug --release --zalgo --browser --minify && mv js/browser/bluebird.js js/browser/bluebird.core.js && mv js/browser/bluebird.min.js js/browser/bluebird.core.min.js"
   },
-  "_npmUser": {
-    "email": "petka_antonov at hotmail.com",
-    "name": "esailija"
+  "homepage": "https://github.com/petkaantonov/bluebird",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/petkaantonov/bluebird.git"
   },
-  "_npmVersion": "5.0.2",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "bluebird",
-    "raw": "bluebird at 3.5.1",
-    "rawSpec": "3.5.1",
-    "scope": null,
-    "spec": "3.5.1",
-    "type": "version"
+  "bugs": {
+    "url": "http://github.com/petkaantonov/bluebird/issues"
   },
-  "_requiredBy": [
-    "#USER"
-  ],
-  "_resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
-  "_shasum": "d9551f9de98f1fcda1e683d17ee91a0602ee2eb9",
-  "_shrinkwrap": null,
-  "_spec": "bluebird at 3.5.1",
-  "_where": "/home/ross/debian/node-bluebird",
+  "license": "MIT",
   "author": {
-    "email": "petka_antonov at hotmail.com",
     "name": "Petka Antonov",
+    "email": "petka_antonov at hotmail.com",
     "url": "http://github.com/petkaantonov/"
   },
-  "browser": "./js/browser/bluebird.js",
-  "bugs": {
-    "url": "http://github.com/petkaantonov/bluebird/issues"
-  },
-  "dependencies": {},
-  "description": "Full featured Promises/A+ implementation with exceptionally good performance",
   "devDependencies": {
     "acorn": "~0.6.0",
     "baconjs": "^0.7.43",
@@ -63,7 +54,6 @@
     "istanbul": "^0.3.5",
     "jshint": "^2.6.0",
     "jshint-stylish": "~0.2.0",
-    "kefir": "^2.4.1",
     "mkdirp": "~0.5.0",
     "mocha": "~2.1",
     "open": "~0.0.5",
@@ -72,59 +62,42 @@
     "rx": "^2.3.25",
     "serve-static": "^1.7.1",
     "sinon": "~1.7.3",
-    "uglify-js": "~2.4.16"
+    "uglify-js": "~2.4.16",
+    "kefir": "^2.4.1"
+  },
+  "main": "./js/release/bluebird.js",
+  "webpack": "./js/release/bluebird.js",
+  "browser": "./js/browser/bluebird.js",
+  "files": [
+    "js/browser",
+    "js/release",
+    "LICENSE"
+  ],
+  "gitHead": "dcfa52bf8b8a8fc5cfb0ca24bccb33f7493960ae",
+  "_id": "bluebird at 3.5.1",
+  "_npmVersion": "5.0.2",
+  "_nodeVersion": "8.0.0",
+  "_npmUser": {
+    "name": "esailija",
+    "email": "petka_antonov at hotmail.com"
   },
-  "directories": {},
   "dist": {
     "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
     "shasum": "d9551f9de98f1fcda1e683d17ee91a0602ee2eb9",
     "tarball": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz"
   },
-  "files": [
-    "LICENSE",
-    "js/browser",
-    "js/release"
-  ],
-  "gitHead": "dcfa52bf8b8a8fc5cfb0ca24bccb33f7493960ae",
-  "homepage": "https://github.com/petkaantonov/bluebird",
-  "keywords": [
-    "async",
-    "await",
-    "deferred",
-    "deferreds",
-    "dsl",
-    "flow control",
-    "fluent interface",
-    "future",
-    "performance",
-    "promise",
-    "promises",
-    "promises-a",
-    "promises-aplus"
-  ],
-  "license": "MIT",
-  "main": "./js/release/bluebird.js",
   "maintainers": [
     {
       "name": "esailija",
       "email": "petka_antonov at hotmail.com"
     }
   ],
-  "name": "bluebird",
-  "optionalDependencies": {},
-  "readme": "ERROR: No README data found!",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/petkaantonov/bluebird.git"
-  },
-  "scripts": {
-    "generate-browser-core": "node tools/build.js --features=core --no-debug --release --zalgo --browser --minify && mv js/browser/bluebird.js js/browser/bluebird.core.js && mv js/browser/bluebird.min.js js/browser/bluebird.core.min.js",
-    "generate-browser-full": "node tools/build.js --no-clean --no-debug --release --browser --minify",
-    "istanbul": "istanbul",
-    "lint": "node scripts/jshint.js",
-    "prepublish": "npm run generate-browser-core && npm run generate-browser-full",
-    "test": "node tools/test.js"
+  "_npmOperationalInternal": {
+    "host": "s3://npm-registry-packages",
+    "tmp": "tmp/bluebird-3.5.1.tgz_1507132268699_0.46325381100177765"
   },
-  "version": "3.5.1",
-  "webpack": "./js/release/bluebird.js"
+  "directories": {},
+  "_shasum": "d9551f9de98f1fcda1e683d17ee91a0602ee2eb9",
+  "_from": "bluebird at 3.5.1",
+  "_resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz"
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-bluebird.git