[Pkg-javascript-commits] [npm] 02/14: Refresh patches

Jérémy Lal kapouer at moszumanska.debian.org
Mon Jul 28 23:28:45 UTC 2014


This is an automated email from the git hooks/post-receive script.

kapouer pushed a commit to branch master
in repository npm.

commit b08e3692a3fbcf95f693fd7ab182a1e9466c912f
Author: Jérémy Lal <kapouer at melix.org>
Date:   Tue Jul 29 00:55:25 2014 +0200

    Refresh patches
---
 debian/patches/2006_rename_node_to_nodejs.patch          | 16 +++++++++++-----
 .../2008_do_not_require_child-process-close.patch        |  2 +-
 debian/patches/2009_ansi-color-table.patch               |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/debian/patches/2006_rename_node_to_nodejs.patch b/debian/patches/2006_rename_node_to_nodejs.patch
index bc1ef18..421f8e2 100644
--- a/debian/patches/2006_rename_node_to_nodejs.patch
+++ b/debian/patches/2006_rename_node_to_nodejs.patch
@@ -45,7 +45,7 @@ Last-Update: 2013-04-28
  
  markdowns = $(shell find doc -name '*.md' | grep -v 'index') README.md
  
-@@ -59,23 +60,23 @@
+@@ -58,23 +59,23 @@
  	@echo "Installing latest published npm"
  	@echo "Use 'make install' or 'make link' to install the code"
  	@echo "in this folder that you're looking at right now."
@@ -63,7 +63,7 @@ Last-Update: 2013-04-28
 -	node cli.js link -f
 +	$(node) cli.js link -f
  
- clean: ronnclean doc-clean uninstall
+ clean: markedclean ronnclean doc-clean uninstall
  	rm -rf npmrc
 -	node cli.js cache clean
 +	$(node) cli.js cache clean
@@ -74,7 +74,7 @@ Last-Update: 2013-04-28
  
  doc: $(mandocs) $(htmldocs)
  
-@@ -114,7 +115,7 @@
+@@ -117,7 +118,7 @@
  	scripts/doc-build.sh $< $@
  
  doc/misc/npm-index.md: scripts/index-build.js package.json
@@ -83,7 +83,13 @@ Last-Update: 2013-04-28
  
  html/doc/index.html: doc/misc/npm-index.md $(html_docdeps)
  	@[ -d html/doc ] || mkdir -p html/doc
-@@ -154,14 +155,14 @@
+@@ -156,19 +157,19 @@
+ marked: node_modules/.bin/marked
+ 
+ node_modules/.bin/marked:
+-	node cli.js install marked --no-global
++	$(node) cli.js install marked --no-global
+ 
  ronn: node_modules/.bin/ronn
  
  node_modules/.bin/ronn:
@@ -116,7 +122,7 @@ Last-Update: 2013-04-28
  // windows: running "npm blah" in this folder will invoke WSH, not node.
 --- a/lib/utils/lifecycle.js
 +++ b/lib/utils/lifecycle.js
-@@ -223,7 +223,10 @@
+@@ -228,7 +228,10 @@
        er.stage = stage
        er.script = cmd
        er.pkgname = pkg.name
diff --git a/debian/patches/2008_do_not_require_child-process-close.patch b/debian/patches/2008_do_not_require_child-process-close.patch
index 96a63a3..8413fb6 100644
--- a/debian/patches/2008_do_not_require_child-process-close.patch
+++ b/debian/patches/2008_do_not_require_child-process-close.patch
@@ -12,4 +12,4 @@ Last-Update: 2013-09-08
 +// require('child-process-close')
  
  var EventEmitter = require("events").EventEmitter
-   , npm = module.exports = new EventEmitter
+   , npm = module.exports = new EventEmitter()
diff --git a/debian/patches/2009_ansi-color-table.patch b/debian/patches/2009_ansi-color-table.patch
index d60c485..0763132 100644
--- a/debian/patches/2009_ansi-color-table.patch
+++ b/debian/patches/2009_ansi-color-table.patch
@@ -25,7 +25,7 @@ Last-Update: 2014-03-01
          })
        }
  
-@@ -89,10 +87,10 @@
+@@ -88,10 +86,10 @@
                  ]
  
    if (npm.color) {

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



More information about the Pkg-javascript-commits mailing list