summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-09 19:39:06 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-09 19:40:58 +0000
commit73b9465d5f546237fd0e306e242d0761dd233568 (patch)
treeec263f46d1bad9562a96164fa4c7ea14c0734788
parentMerging upstream version 5.8.0+ds. (diff)
downloadnpm-73b9465d5f546237fd0e306e242d0761dd233568.zip
npm-73b9465d5f546237fd0e306e242d0761dd233568.tar.xz
Merging debian version 5.8.0+ds-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog44
-rw-r--r--debian/compat2
-rw-r--r--debian/control159
-rw-r--r--debian/control.in68
-rw-r--r--debian/copyright43
-rw-r--r--debian/doc-base.api9
-rw-r--r--debian/doc-base.cli4
-rw-r--r--debian/doc-base.files9
-rw-r--r--debian/doc-base.misc10
-rw-r--r--debian/install7
-rw-r--r--debian/patches/2001_unicode_in_md.patch12
-rw-r--r--debian/patches/2002_use_ruby_ronn.patch125
-rw-r--r--debian/patches/2003_fix_doc.patch2
-rw-r--r--debian/patches/2005_index_build_dont_run_npm.patch8
-rw-r--r--debian/patches/2006_rename_node_to_nodejs.patch101
-rw-r--r--debian/patches/2007_do_not_require_cmd-shim.patch17
-rw-r--r--debian/patches/2008_do_not_require_child-process-close.patch15
-rw-r--r--debian/patches/2009_ansi-color-table.patch58
-rw-r--r--debian/patches/2010_privacy_breach_travis.patch9
-rw-r--r--debian/patches/2011_node-gyp-path.patch36
-rw-r--r--debian/patches/2012_marked_path.patch45
-rw-r--r--debian/patches/2013_make_clean_force.patch15
-rw-r--r--debian/patches/series6
-rwxr-xr-xdebian/rules55
-rw-r--r--debian/source/lintian-overrides4
-rw-r--r--debian/tests/control4
-rw-r--r--debian/watch4
27 files changed, 415 insertions, 456 deletions
diff --git a/debian/changelog b/debian/changelog
index 3c2146e..73fc788 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,47 @@
+npm (5.8.0+ds-1) experimental; urgency=medium
+
+ [ Diane Trout ]
+ * New upstream release (Closes: #870460, #863963, #794890, #857986)
+
+ [ Jérémy Lal ]
+ * Switch to dh
+ * Section javascript
+ * Priority optional
+ * Drop Jonas from uploaders because of the move to dh
+ * Update Homepage url
+ * Update Vcs-Browser url
+ * Fix make clean
+ * Override make targets
+ * Temp workaround for failure with prefix/npmrc
+ * Build-Depends node-tacks, node-tap for running tests
+ * Build-Depends node-require-inject for tests
+ * Drop ruby-ronn from build-dependencies
+ * Actually call make clean
+ * NPMOPTS not needed because it does not have to install modules
+ * Exclude request entirely
+ * Exclude node-gyp entirely
+ * Fix install and noop for auto_install
+ * Use repacksuffix
+ * make clean can fail
+ * Disable tests for now
+ * Fix syntax error in watch
+ * repacksuffix makes uversionmangle useless
+ * Add comment for tests
+ * Ignore case to remove extra license files
+ * watch file syntax again
+ * npm need a recent node-tar
+ * Call /usr/bin/node-gyp instead of second-guess where it is
+
+ [ Pirate Praveen ]
+ * add node-fs-vacuum as dependency
+ * remove all .npmignore files
+ * drop unique-filename, already in the archive
+ * add node-unique-filename as a dependency
+ * add lintian overrides
+ * Reorganize doc-base structure
+
+ -- Pirate Praveen <praveen@debian.org> Wed, 18 Jul 2018 21:37:49 +0530
+
npm (1.4.21+ds-2~dschinn1) dschinn-backports; urgency=medium
* Initial upload to dschinn-backports.
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 1fc68ef..afb6f4f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,26 +1,101 @@
Source: npm
-Section: web
-Priority: extra
+Section: javascript
+Priority: optional
Maintainer: Progress Linux Maintainers <maintainers@lists.progress-linux.org>
XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org>
XSBC-Original-Maintainer: Debian Javascript Maintainers <pkg-javascript-devel@lists.alioth.debian.org>
XSBC-Original-Uploaders: Jérémy Lal <kapouer@melix.org>,
- Jonas Smedegaard <dr@jones.dk>
+ Pirate Praveen <praveen@debian.org>
Bugs: mailto:maintainers@lists.progress-linux.org
-Build-Depends: cdbs,
- debhelper,
+Build-Depends:
+ debhelper (>= 9~),
dh-buildinfo,
bash-completion,
nodejs,
+ node-ansi-color-table,
+ node-ansi-regex,
+ node-ansistyles,
+ node-aproba,
+ node-archy,
+ node-are-we-there-yet,
+ node-aws-sign2,
+ node-bluebird,
+ node-caseless,
+ node-chalk,
+ node-config-chain,
+ node-detect-indent,
+ node-editor,
+ node-encoding,
+ node-fs-vacuum,
+ node-gauge,
node-glob,
- ruby-ronn,
- node-marked
-Standards-Version: 3.9.5
-Homepage: http://github.com/isaacs/npm
+ node-graceful-fs,
+ node-gyp,
+ node-har-validator,
+ node-has-unicode,
+ node-hawk,
+ node-hosted-git-info,
+ node-iferr,
+ node-import-lazy,
+ node-imurmurhash,
+ node-inflight,
+ node-inherits,
+ node-ini,
+ node-isstream,
+ node-is-npm,
+ node-is-typedarray,
+ node-jsonstream,
+ node-json-stringify-safe,
+ node-lazy-property,
+ node-latest-version,
+ node-lockfile,
+ node-lru-cache,
+ node-marked,
+ node-marked-man,
+ node-mime-types,
+ node-mkdirp,
+ node-move-concurrently,
+ node-nopt,
+ node-normalize-package-data,
+ node-npmlog,
+ node-once,
+ node-opener,
+ node-osenv,
+ node-path-is-inside,
+ node-performance-now,
+ node-promise-inflight,
+ node-qw,
+ node-read-package-json,
+ node-readable-stream,
+ node-request,
+ node-retry,
+ node-rimraf,
+ node-safe-buffer,
+ node-semver,
+ node-semver-diff,
+ node-set-blocking,
+ node-slide,
+ node-sorted-object,
+ node-stringstream,
+ node-strip-ansi,
+ node-tacks,
+ node-tap,
+ node-require-inject,
+ node-tar (>= 4~),
+ node-tough-cookie,
+ node-uid-number,
+ node-unique-filename,
+ node-unpipe,
+ node-validate-npm-package-license,
+ node-which,
+ node-wrappy,
+ node-yargs
+Standards-Version: 4.1.0
+Homepage: https://github.com/npm/npm
Vcs-Browser: https://sources.progress-linux.org/distributions/dschinn-backports/packages/npm
Vcs-Git: https://sources.progress-linux.org/distributions/dschinn-backports/packages/npm
-XSBC-Original-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-javascript/npm.git
-XSBC-Original-Vcs-Git: git://anonscm.debian.org/pkg-javascript/npm.git
+XSBC-Original-Vcs-Browser: https://salsa.debian.org/js-team/npm
+XSBC-Original-Vcs-Git: https://salsa.debian.org/js-team/npm.git
Package: npm
Architecture: all
@@ -29,35 +104,83 @@ Depends: nodejs,
node-abbrev (>= 1.0.4),
node-ansi (>= 0.3.0-2),
node-ansi-color-table,
+ node-ansi-regex,
+ node-ansistyles,
+ node-aproba,
+ node-aproba,
node-archy,
+ node-are-we-there-yet,
+ node-aws-sign2,
+ node-bluebird,
node-block-stream,
+ node-caseless,
+ node-chalk,
+ node-config-chain,
+ node-detect-indent,
+ node-editor,
+ node-encoding,
+ node-fs-vacuum,
node-fstream (>= 0.1.22),
node-fstream-ignore,
+ node-gauge,
node-github-url-from-git,
node-glob (>= 3.1.21),
node-graceful-fs (>= 2.0.0),
+ node-gyp (>= 0.10.9),
+ node-har-validator,
+ node-has-unicode,
+ node-hawk,
+ node-hosted-git-info,
+ node-iferr,
+ node-import-lazy,
+ node-inflight,
node-inherits,
node-ini (>= 1.1.0),
+ node-isstream,
+ node-is-npm,
+ node-is-typedarray,
+ node-jsonstream,
+ node-latest-version,
+ node-lazy-property,
node-lockfile,
node-lru-cache (>= 2.3.0),
node-minimatch (>= 0.2.11),
node-mkdirp (>= 0.3.3),
- node-gyp (>= 0.10.9),
- node-nopt (>= 3.0.1),
- node-npmlog,
+ node-move-concurrently,
+ node-nopt,
+ node-normalize-package-data,
+ node-npmlog (>= 4.1.0),
node-once,
+ node-opener,
node-osenv,
+ node-path-is-inside,
+ node-performance-now,
+ node-promise-inflight,
node-read,
node-read-package-json (>= 1.1.0),
+ node-readable-stream,
node-request (>= 2.25.0),
node-retry,
- node-rimraf (>= 2.2.2),
- node-semver (>= 2.1.0),
+ node-rimraf (>= 2.6.2),
+ node-safe-buffer,
+ node-semver (>= 5.1.0),
+ node-semver-diff,
+ node-set-blocking,
node-sha,
node-slide,
- node-tar (>= 0.1.18),
+ node-sorted-object,
+ node-stringstream,
+ node-strip-ansi,
+ node-tar (>= 4~),
+ node-tough-cookie,
+ node-uid-number,
node-underscore,
- node-which
+ node-unique-filename,
+ node-unpipe,
+ node-validate-npm-package-license,
+ node-which,
+ node-wrappy,
+ node-yargs,
Description: package manager for Node.js
Node.js is an event-based server-side javascript engine.
.
diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index 54461af..0000000
--- a/debian/control.in
+++ /dev/null
@@ -1,68 +0,0 @@
-Source: npm
-Section: web
-Priority: extra
-Maintainer: Progress Linux Maintainers <maintainers@lists.progress-linux.org>
-XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org>
-XSBC-Original-Maintainer: Debian Javascript Maintainers <pkg-javascript-devel@lists.alioth.debian.org>
-XSBC-Original-Uploaders: Jérémy Lal <kapouer@melix.org>,
- Jonas Smedegaard <dr@jones.dk>
-Bugs: mailto:maintainers@lists.progress-linux.org
-Build-Depends: @cdbs@,
- bash-completion,
- nodejs,
- node-glob,
- ruby-ronn,
- node-marked
-Standards-Version: 3.9.5
-Homepage: http://github.com/isaacs/npm
-Vcs-Browser: https://sources.progress-linux.org/distributions/dschinn-backports/packages/npm
-Vcs-Git: https://sources.progress-linux.org/distributions/dschinn-backports/packages/npm
-XSBC-Original-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-javascript/npm.git
-XSBC-Original-Vcs-Git: git://anonscm.debian.org/pkg-javascript/npm.git
-
-Package: npm
-Architecture: all
-Depends: nodejs,
- ${misc:Depends},
- node-abbrev (>= 1.0.4),
- node-ansi (>= 0.3.0-2),
- node-ansi-color-table,
- node-archy,
- node-block-stream,
- node-fstream (>= 0.1.22),
- node-fstream-ignore,
- node-github-url-from-git,
- node-glob (>= 3.1.21),
- node-graceful-fs (>= 2.0.0),
- node-inherits,
- node-ini (>= 1.1.0),
- node-lockfile,
- node-lru-cache (>= 2.3.0),
- node-minimatch (>= 0.2.11),
- node-mkdirp (>= 0.3.3),
- node-gyp (>= 0.10.9),
- node-nopt (>= 3.0.1),
- node-npmlog,
- node-once,
- node-osenv,
- node-read,
- node-read-package-json (>= 1.1.0),
- node-request (>= 2.25.0),
- node-retry,
- node-rimraf (>= 2.2.2),
- node-semver (>= 2.1.0),
- node-sha,
- node-slide,
- node-tar (>= 0.1.18),
- node-underscore,
- node-which
-Description: package manager for Node.js
- Node.js is an event-based server-side javascript engine.
- .
- npm is the package manager for the Node JavaScript platform. It puts
- modules in place so that node can find them, and manages dependency
- conflicts intelligently.
- .
- It is extremely configurable to support a wide variety of use cases.
- Most commonly, it is used to publish, discover, install, and develop
- node programs.
diff --git a/debian/copyright b/debian/copyright
index 5cd2ec8..781e1ab 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,42 +7,63 @@ Source: http://github.com/isaacs/npm
they are removed; or they are not good candidates for being packaged
at the moment, in which case they are kept.
Files-Excluded:
+ node_modules/JSONStream/*
node_modules/abbrev/*
- node_modules/ansi/*
+ node_modules/ansi-regex/*
node_modules/ansicolors/*
node_modules/ansistyles/*
+ node_modules/aproba/*
node_modules/archy/*
- node_modules/block-stream/*
- node_modules/child-process-close/*
- node_modules/cmd-shim/*
- node_modules/fstream/*
- node_modules/fstream-npm/node_modules/fstream-ignore/*
- node_modules/github-url-from-git/*
+ node_modules/config-chain/*
+ node_modules/detect-indent/*
+ node_modules/editor/*
node_modules/glob/*
node_modules/graceful-fs/*
+ node_modules/has-unicode/*
+ node_modules/hosted-git-info/*
+ node_modules/iferr/*
node_modules/inherits/*
node_modules/ini/*
+ node_modules/lazy-property/*
node_modules/lockfile/*
node_modules/lru-cache/*
- node_modules/minimatch/*
node_modules/mkdirp/*
- node_modules/node-gyp/*
+ node_modules/move-concurrently/*
node_modules/nopt/*
+ node_modules/normalize-package-data/*
node_modules/npmlog/*
node_modules/once/*
+ node_modules/opener/*
node_modules/osenv/*
+ node_modules/path-is-inside/*
+ node_modules/promise-inflight/*
+ node_modules/qw/*
node_modules/read/*
node_modules/read-package-json/*
+ node_modules/readable-stream/*
node_modules/request/*
node_modules/retry/*
node_modules/rimraf/*
+ node_modules/safe-buffer/*
node_modules/semver/*
node_modules/sha/*
node_modules/slide/*
- node_modules/tar/*
+ node_modules/sorted-object/*
+ node_modules/strip-ansi/*
node_modules/text-table/*
+ node_modules/unpipe/*
+ node_modules/validate-npm-package-license/*
node_modules/which/*
- node_modules/columnify/node_modules/wcwidth.js/node_modules/underscore/*
+ node_modules/wrappy/*
+ node_modules/libnpx/node_modules/yargs/*
+ node_modules/npm-lifecycle/node_modules/node-gyp/*
+ node_modules/npm-profile/node_modules/make-fetch-happen/node_modules/node-fetch-npm/node_modules/encoding/*
+ node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/node_modules/encoding/*
+ node_modules/update-notifier/node_modules/chalk/*
+ node_modules/update-notifier/node_modules/import-lazy/*
+ node_modules/update-notifier/node_modules/is-npm/*
+ node_modules/update-notifier/node_modules/latest-version/*
+ node_modules/update-notifier/node_modules/semver-diff/*
Files: *
Copyright: 2009-2014, npm, Inc. and Contributors
diff --git a/debian/doc-base.api b/debian/doc-base.api
deleted file mode 100644
index 5ab5163..0000000
--- a/debian/doc-base.api
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: npm-api
-Title: Npm API documentation
-Author: Isaac Z. Schlueter
-Abstract: This describes the API of npm.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/npm/api/npm.html
-Files: /usr/share/doc/npm/api/*.html \ No newline at end of file
diff --git a/debian/doc-base.cli b/debian/doc-base.cli
index 13b5a19..c5681cd 100644
--- a/debian/doc-base.cli
+++ b/debian/doc-base.cli
@@ -5,5 +5,5 @@ Abstract: This describes command-line usage of npm.
Section: Programming
Format: HTML
-Index: /usr/share/doc/npm/cli/npm.html
-Files: /usr/share/doc/npm/cli/*.html
+Index: /usr/share/doc/npm/index.html
+Files: /usr/share/doc/npm/*.html
diff --git a/debian/doc-base.files b/debian/doc-base.files
deleted file mode 100644
index c2ef69a..0000000
--- a/debian/doc-base.files
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: npm-files
-Title: Npm files documentation
-Author: Isaac Z. Schlueter
-Abstract: This describes the files used by npm.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/npm/misc/npm-index.html
-Files: /usr/share/doc/npm/files/*.html
diff --git a/debian/doc-base.misc b/debian/doc-base.misc
deleted file mode 100644
index 707fc28..0000000
--- a/debian/doc-base.misc
+++ /dev/null
@@ -1,10 +0,0 @@
-Document: npm-misc
-Title: Npm miscellaneous documentation
-Author: Isaac Z. Schlueter
-Abstract: Various aspects of npm: coding-style, config, developers, disputes,
- faq, index, registry, scripts, removal, semver.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/npm/misc/npm-index.html
-Files: /usr/share/doc/npm/misc/*.html
diff --git a/debian/install b/debian/install
index f6f5f22..afc4333 100644
--- a/debian/install
+++ b/debian/install
@@ -1,5 +1,10 @@
lib/*.js usr/share/npm/lib
-lib/cache usr/share/npm/lib
+lib/auth/*.js usr/share/npm/lib/auth
+lib/config/*.js usr/share/npm/lib/config
+lib/doctor/*.js usr/share/npm/lib/doctor
+lib/install/*.js usr/share/npm/lib/install
+lib/install/action/*.js usr/share/npm/lib/install/action
+lib/search/*.js usr/share/npm/lib/search
lib/utils/*.js usr/share/npm/lib/utils
lib/utils/completion usr/share/npm/lib/utils
lib/utils/completion.sh usr/share/npm/lib/utils
diff --git a/debian/patches/2001_unicode_in_md.patch b/debian/patches/2001_unicode_in_md.patch
index 6153528..70a1b73 100644
--- a/debian/patches/2001_unicode_in_md.patch
+++ b/debian/patches/2001_unicode_in_md.patch
@@ -6,7 +6,7 @@ Forwarded: not-needed
Last-Update: 2014-07-29
--- a/doc/cli/npm-ls.md
+++ b/doc/cli/npm-ls.md
-@@ -19,8 +19,8 @@
+@@ -18,8 +18,8 @@
For example, running `npm ls promzard` in npm's source tree will show:
npm@@VERSION@ /path/to/npm
@@ -19,14 +19,14 @@ Last-Update: 2014-07-29
--- a/doc/files/package.json.md
+++ b/doc/files/package.json.md
-@@ -427,8 +427,8 @@
- installed if needed. `npm install tea-latte` could possibly yield the following
- dependency graph:
+@@ -594,8 +594,8 @@
+ major version of the host package `tea` only. `npm install tea-latte` could
+ possibly yield the following dependency graph:
- ├── tea-latte@1.3.5
- └── tea@2.2.0
+ |-- tea-latte@1.3.5
+ |-- tea@2.2.0
- Trying to install another plugin with a conflicting requirement will cause an
- error. For this reason, make sure your plugin requirement is as broad as
+ **NOTE: npm versions 1 and 2 will automatically install `peerDependencies` if
+ they are not explicitly depended upon higher in the dependency tree. In the
diff --git a/debian/patches/2002_use_ruby_ronn.patch b/debian/patches/2002_use_ruby_ronn.patch
deleted file mode 100644
index 8a8de0d..0000000
--- a/debian/patches/2002_use_ruby_ronn.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-Description: Use ruby-ronn and marked to generate documentation
- Command-line options are different. Perl doesn't need -i switch.
-Forwarded: not-needed
-Author: Jérémy Lal <kapouer@melix.org>
-Last-Update: 2014-07-29
---- a/scripts/doc-build.sh
-+++ b/scripts/doc-build.sh
-@@ -1,63 +1,5 @@
- #!/usr/bin/env bash
-
--if [[ $DEBUG != "" ]]; then
-- set -x
--fi
--set -o errexit
--set -o pipefail
--
--if ! [ -x node_modules/.bin/ronn ]; then
-- ps=0
-- if [ -f .building_ronn ]; then
-- pid=$(cat .building_ronn)
-- ps=$(ps -p $pid | grep $pid | wc -l) || true
-- fi
--
-- if [ -f .building_ronn ] && [ $ps != 0 ]; then
-- while [ -f .building_ronn ]; do
-- sleep 1
-- done
-- else
-- # a race to see which make process will be the one to install ronn
-- echo $$ > .building_ronn
-- sleep 1
-- if [ $(cat .building_ronn) == $$ ]; then
-- make node_modules/.bin/ronn
-- rm .building_ronn
-- else
-- while [ -f .building_ronn ]; do
-- sleep 1
-- done
-- fi
-- fi
--fi
--
--if ! [ -x node_modules/.bin/marked ]; then
-- ps=0
-- if [ -f .building_marked ]; then
-- pid=$(cat .building_marked)
-- ps=$(ps -p $pid | grep $pid | wc -l) || true
-- fi
--
-- if [ -f .building_marked ] && [ $ps != 0 ]; then
-- while [ -f .building_marked ]; do
-- sleep 1
-- done
-- else
-- # a race to see which make process will be the one to install marked
-- echo $$ > .building_marked
-- sleep 1
-- if [ $(cat .building_marked) == $$ ]; then
-- make node_modules/.bin/marked
-- rm .building_marked
-- else
-- while [ -f .building_marked ]; do
-- sleep 1
-- done
-- fi
-- fi
--fi
--
- src=$1
- dest=$2
- name=$(basename ${src%.*})
-@@ -68,36 +10,36 @@
-
- case $dest in
- *.[1357])
-- ./node_modules/.bin/ronn --roff $src \
-+ cat $src | ronn \
- | sed "s|@VERSION@|$version|g" \
-- | perl -pi -e 's/(npm\\-)?([^\(]*)\(1\)/npm help \2/g' \
-- | perl -pi -e 's/(npm\\-)?([^\(]*)\([57]\)/npm help \3 \2/g' \
-- | perl -pi -e 's/(npm\\-)?([^\(]*)\(3\)/npm apihelp \2/g' \
-- | perl -pi -e 's/npm\(1\)/npm help npm/g' \
-- | perl -pi -e 's/npm\(3\)/npm apihelp npm/g' \
-+ | perl -p -e 's/(npm\\-)?([^\(]*)\(1\)/npm help \2/g' \
-+ | perl -p -e 's/(npm\\-)?([^\(]*)\([57]\)/npm help \3 \2/g' \
-+ | perl -p -e 's/(npm\\-)?([^\(]*)\(3\)/npm apihelp \2/g' \
-+ | perl -p -e 's/npm\(1\)/npm help npm/g' \
-+ | perl -p -e 's/npm\(3\)/npm apihelp npm/g' \
- > $dest
- exit $?
- ;;
- *.html)
- url=${dest/html\//}
- (cat html/dochead.html && \
-- cat $src | ./node_modules/.bin/marked &&
-+ cat $src | marked &&
- cat html/docfoot.html)\
- | sed "s|@NAME@|$name|g" \
- | sed "s|@DATE@|$date|g" \
- | sed "s|@URL@|$url|g" \
- | sed "s|@VERSION@|$version|g" \
-- | perl -pi -e 's/<h1([^>]*)>([^\(]*\([0-9]\)) -- (.*?)<\/h1>/<h1>\2<\/h1> <p>\3<\/p>/g' \
-- | perl -pi -e 's/npm-npm/npm/g' \
-- | perl -pi -e 's/([^"-])(npm-)?README(?!\.html)(\(1\))?/\1<a href="..\/..\/doc\/README.html">README<\/a>/g' \
-- | perl -pi -e 's/<title><a href="[^"]+README.html">README<\/a><\/title>/<title>README<\/title>/g' \
-- | perl -pi -e 's/([^"-])([^\(> ]+)(\(1\))/\1<a href="..\/cli\/\2.html">\2\3<\/a>/g' \
-- | perl -pi -e 's/([^"-])([^\(> ]+)(\(3\))/\1<a href="..\/api\/\2.html">\2\3<\/a>/g' \
-- | perl -pi -e 's/([^"-])([^\(> ]+)(\(5\))/\1<a href="..\/files\/\2.html">\2\3<\/a>/g' \
-- | perl -pi -e 's/([^"-])([^\(> ]+)(\(7\))/\1<a href="..\/misc\/\2.html">\2\3<\/a>/g' \
-- | perl -pi -e 's/\([1357]\)<\/a><\/h1>/<\/a><\/h1>/g' \
-+ | perl -p -e 's/<h1([^>]*)>([^\(]*\([0-9]\)) -- (.*?)<\/h1>/<h1>\2<\/h1> <p>\3<\/p>/g' \
-+ | perl -p -e 's/npm-npm/npm/g' \
-+ | perl -p -e 's/([^"-])(npm-)?README(?!\.html)(\(1\))?/\1<a href="..\/..\/doc\/README.html">README<\/a>/g' \
-+ | perl -p -e 's/<title><a href="[^"]+README.html">README<\/a><\/title>/<title>README<\/title>/g' \
-+ | perl -p -e 's/([^"-])([^\(> ]+)(\(1\))/\1<a href="..\/cli\/\2.html">\2\3<\/a>/g' \
-+ | perl -p -e 's/([^"-])([^\(> ]+)(\(3\))/\1<a href="..\/api\/\2.html">\2\3<\/a>/g' \
-+ | perl -p -e 's/([^"-])([^\(> ]+)(\(5\))/\1<a href="..\/files\/\2.html">\2\3<\/a>/g' \
-+ | perl -p -e 's/([^"-])([^\(> ]+)(\(7\))/\1<a href="..\/misc\/\2.html">\2\3<\/a>/g' \
-+ | perl -p -e 's/\([1357]\)<\/a><\/h1>/<\/a><\/h1>/g' \
- | (if [ $(basename $(dirname $dest)) == "doc" ]; then
-- perl -pi -e 's/ href="\.\.\// href="/g'
-+ perl -p -e 's/ href="\.\.\// href="/g'
- else
- cat
- fi) \
diff --git a/debian/patches/2003_fix_doc.patch b/debian/patches/2003_fix_doc.patch
index c9d5a4a..d7a509c 100644
--- a/debian/patches/2003_fix_doc.patch
+++ b/debian/patches/2003_fix_doc.patch
@@ -4,7 +4,7 @@ Author: Jérémy Lal <kapouer@melix.org>
Last-Update: 2012-04-07
--- a/doc/files/npm-folders.md
+++ b/doc/files/npm-folders.md
-@@ -135,7 +135,7 @@
+@@ -138,7 +138,7 @@
Another optimization can be made by installing dependencies at the
highest level possible, below the localized "target" folder.
diff --git a/debian/patches/2005_index_build_dont_run_npm.patch b/debian/patches/2005_index_build_dont_run_npm.patch
index eb20a39..96d07fb 100644
--- a/debian/patches/2005_index_build_dont_run_npm.patch
+++ b/debian/patches/2005_index_build_dont_run_npm.patch
@@ -5,12 +5,12 @@ Author: Jérémy Lal <kapouer@melix.org>
Last-Update: 2013-09-08
--- a/scripts/doc-build.sh
+++ b/scripts/doc-build.sh
-@@ -4,7 +4,7 @@
+@@ -10,7 +10,7 @@
dest=$2
name=$(basename ${src%.*})
- date=$(date -u +'%Y-%M-%d %H:%m:%S')
--version=$(node cli.js -v)
-+version=$(nodejs -e "console.log(require('./package').version)")
+ date=$(date -u +'%Y-%m-%d %H:%M:%S')
+-version=$(node bin/npm-cli.js -v)
++version=$(nodejs bin/npm-cli.js -v)
mkdir -p $(dirname $dest)
diff --git a/debian/patches/2006_rename_node_to_nodejs.patch b/debian/patches/2006_rename_node_to_nodejs.patch
index 421f8e2..e9df7d3 100644
--- a/debian/patches/2006_rename_node_to_nodejs.patch
+++ b/debian/patches/2006_rename_node_to_nodejs.patch
@@ -6,14 +6,6 @@ Forwarded: not-needed
Author: Jérémy Lal <kapouer@melix.org>
Last-Update: 2013-04-28
---- a/scripts/index-build.js
-+++ b/scripts/index-build.js
-@@ -1,4 +1,4 @@
--#!/usr/bin/env node
-+#!/usr/bin/nodejs
- var fs = require("fs")
- , path = require("path")
- , root = path.resolve(__dirname, "..")
--- a/scripts/clean-old.sh
+++ b/scripts/clean-old.sh
@@ -26,7 +26,7 @@
@@ -34,8 +26,8 @@ Last-Update: 2013-04-28
-node=`which node 2>&1`
+node=`which nodejs 2>&1`
ret=$?
- if [ $ret -eq 0 ] && [ -x "$node" ]; then
- (exit 0)
+ # if not found, try "nodejs" as it is the case on debian
+ if [ $ret -ne 0 ]; then
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
@@ -43,94 +35,13 @@ Last-Update: 2013-04-28
SHELL = bash
+node = nodejs
- markdowns = $(shell find doc -name '*.md' | grep -v 'index') README.md
-
-@@ -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."
-- node cli.js install -g -f npm
-+ $(node) cli.js install -g -f npm
-
- install: docclean all
-- node cli.js install -g -f
-+ $(node) cli.js install -g -f
-
- # backwards compat
- dev: install
-
- link: uninstall
-- node cli.js link -f
-+ $(node) cli.js link -f
-
- clean: markedclean ronnclean doc-clean uninstall
- rm -rf npmrc
-- node cli.js cache clean
-+ $(node) cli.js cache clean
-
- uninstall:
-- node cli.js rm npm -g -f
-+ $(node) cli.js rm npm -g -f
-
- doc: $(mandocs) $(htmldocs)
-
-@@ -117,7 +118,7 @@
- scripts/doc-build.sh $< $@
-
- doc/misc/npm-index.md: scripts/index-build.js package.json
-- node scripts/index-build.js > $@
-+ $(node) scripts/index-build.js > $@
-
- html/doc/index.html: doc/misc/npm-index.md $(html_docdeps)
- @[ -d html/doc ] || mkdir -p html/doc
-@@ -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:
-- node cli.js install ronn --no-global
-+ $(node) cli.js install ronn --no-global
-
- doc: man
-
- man: $(cli_docs) $(api_docs)
-
- test: doc
-- node cli.js test
-+ $(node) cli.js test
-
- publish: link doc
- @git push origin :v$(shell npm -v) 2>&1 || true
---- a/cli.js
-+++ b/cli.js
-@@ -1,2 +1,2 @@
--#!/usr/bin/env node
-+#!/usr/bin/nodejs
- require("./bin/npm-cli.js")
+ PUBLISHTAG = $(shell node scripts/publish-tag.js)
+ BRANCH = $(shell git rev-parse --abbrev-ref HEAD)
--- a/bin/npm-cli.js
+++ b/bin/npm-cli.js
@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/nodejs
;(function () { // wrapper in case we're in module_context mode
-
- // windows: running "npm blah" in this folder will invoke WSH, not node.
---- a/lib/utils/lifecycle.js
-+++ b/lib/utils/lifecycle.js
-@@ -228,7 +228,10 @@
- er.stage = stage
- er.script = cmd
- er.pkgname = pkg.name
-- return cb(er)
-+ cb(er)
-+ log.warn('', 'This failure might be due to the use of legacy binary "node"')
-+ log.warn("For further explanations, please read\n/usr/share/doc/nodejs/README.Debian\n")
-+ return
- } else if (er) {
- log.error(pkg._id+"."+stage, er)
- log.error(pkg._id+"."+stage, "continuing anyway")
+ // windows: running "npm blah" in this folder will invoke WSH, not node.
+ /*global WScript*/
diff --git a/debian/patches/2007_do_not_require_cmd-shim.patch b/debian/patches/2007_do_not_require_cmd-shim.patch
deleted file mode 100644
index 5c4fc38..0000000
--- a/debian/patches/2007_do_not_require_cmd-shim.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: cmd-shim is only needed on win32
-Author: Jérémy Lal <kapouer@melix.org>
-Forwarded: not-needed, todo: better patch
-Last-Update: 2013-09-08
---- a/lib/build.js
-+++ b/lib/build.js
-@@ -16,8 +16,8 @@
- , readJson = require("read-package-json")
- , link = require("./utils/link.js")
- , linkIfExists = link.ifExists
-- , cmdShim = require("cmd-shim")
-- , cmdShimIfExists = cmdShim.ifExists
-+// , cmdShim = require("cmd-shim")
-+// , cmdShimIfExists = cmdShim.ifExists
- , asyncMap = require("slide").asyncMap
-
- module.exports = build
diff --git a/debian/patches/2008_do_not_require_child-process-close.patch b/debian/patches/2008_do_not_require_child-process-close.patch
deleted file mode 100644
index 8413fb6..0000000
--- a/debian/patches/2008_do_not_require_child-process-close.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: child-process-close is not needed with nodejs 0.10.x
-Author: Jérémy Lal <kapouer@melix.org>
-Forwarded: not-needed
-Last-Update: 2013-09-08
---- a/lib/npm.js
-+++ b/lib/npm.js
-@@ -12,7 +12,7 @@
-
-
- // monkey-patch support for 0.6 child processes
--require('child-process-close')
-+// require('child-process-close')
-
- var EventEmitter = require("events").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 7d9c7f3..f53d74e 100644
--- a/debian/patches/2009_ansi-color-table.patch
+++ b/debian/patches/2009_ansi-color-table.patch
@@ -6,38 +6,38 @@ Forwarded: not-needed, waiting for upstream ansi.js to accept patch
Last-Update: 2014-08-05
--- a/lib/outdated.js
+++ b/lib/outdated.js
-@@ -29,9 +29,9 @@
- , npm = require("./npm.js")
- , url = require("url")
- , isGitUrl = require("./utils/is-git-url.js")
-- , color = require("ansicolors")
-- , styles = require("ansistyles")
-- , table = require("text-table")
-+ , color = require("ansi")
-+ , styles = color
-+ , table = require("ansi-color-table")
- , semver = require("semver")
- , os = require("os")
-
+@@ -26,9 +26,9 @@
+ var readPackageTree = require('read-package-tree')
+ var readJson = require('read-package-json')
+ var asyncMap = require('slide').asyncMap
+-var color = require('ansicolors')
+-var styles = require('ansistyles')
+-var table = require('text-table')
++var color = require('ansi')
++var styles = color
++var table = require('ansi-color-table')
+ var semver = require('semver')
+ var npa = require('npm-package-arg')
+ var mutateIntoLogicalTree = require('./install/mutate-into-logical-tree.js')
--- a/lib/help-search.js
+++ b/lib/help-search.js
@@ -6,7 +6,7 @@
- , asyncMap = require("slide").asyncMap
- , npm = require("./npm.js")
- , glob = require("glob")
-- , color = require("ansicolors")
-+ , color = require("ansi")
-
- helpSearch.usage = "npm help-search <text>"
+ var asyncMap = require('slide').asyncMap
+ var npm = require('./npm.js')
+ var glob = require('glob')
+-var color = require('ansicolors')
++var color = require('ansi')
+ var output = require('./utils/output.js')
+ helpSearch.usage = 'npm help-search <text>'
--- a/lib/ls.js
+++ b/lib/ls.js
-@@ -15,7 +15,7 @@
- , semver = require("semver")
- , url = require("url")
- , isGitUrl = require("./utils/is-git-url.js")
-- , color = require("ansicolors")
-+ , color = require("ansi")
-
- ls.usage = "npm ls"
-
+@@ -11,7 +11,7 @@
+ var readPackageTree = require('read-package-tree')
+ var archy = require('archy')
+ var semver = require('semver')
+-var color = require('ansicolors')
++var color = require('ansi')
+ var npa = require('npm-package-arg')
+ var sortedObject = require('sorted-object')
+ var npm = require('./npm.js')
diff --git a/debian/patches/2010_privacy_breach_travis.patch b/debian/patches/2010_privacy_breach_travis.patch
index c728216..0e92853 100644
--- a/debian/patches/2010_privacy_breach_travis.patch
+++ b/debian/patches/2010_privacy_breach_travis.patch
@@ -5,11 +5,12 @@ Author: Jérémy Lal <kapouer@melix.org>
Last-Update: 2014-07-29
--- a/README.md
+++ b/README.md
-@@ -1,6 +1,6 @@
- npm(1) -- node package manager
+@@ -1,7 +1,7 @@
+ npm(1) -- a JavaScript package manager
==============================
--[![Build Status](https://img.shields.io/travis/npm/npm/master.svg)](https://travis-ci.org/npm/npm)
+
+-[![Build Status](https://img.shields.io/travis/npm/npm/latest.svg)](https://travis-ci.org/npm/npm)
+[Build Status](https://travis-ci.org/npm/npm)
+
## SYNOPSIS
- This is just enough info to get you up and running.
diff --git a/debian/patches/2011_node-gyp-path.patch b/debian/patches/2011_node-gyp-path.patch
new file mode 100644
index 0000000..e561475
--- /dev/null
+++ b/debian/patches/2011_node-gyp-path.patch
@@ -0,0 +1,36 @@
+Author: Diane Trout <diane@ghic.org>
+Forwarded: not-needed
+Description: Use the Debian packaged version of node-gyp instead
+ of the convenience copy that was removed on repack.
+
+--- a/bin/node-gyp-bin/node-gyp
++++ b/bin/node-gyp-bin/node-gyp
+@@ -1,6 +1,6 @@
+ #!/usr/bin/env sh
+ if [ "x$npm_config_node_gyp" = "x" ]; then
+- node "`dirname "$0"`/../../node_modules/node-gyp/bin/node-gyp.js" "$@"
++ /usr/bin/node-gyp "$@"
+ else
+ "$npm_config_node_gyp" "$@"
+ fi
+--- a/node_modules/npm-lifecycle/node-gyp-bin/node-gyp
++++ b/node_modules/npm-lifecycle/node-gyp-bin/node-gyp
+@@ -1,6 +1,6 @@
+ #!/usr/bin/env sh
+ if [ "x$npm_config_node_gyp" = "x" ]; then
+- node "`dirname "$0"`/../../node_modules/node-gyp/bin/node-gyp.js" "$@"
++ /usr/bin/node-gyp "$@"
+ else
+ "$npm_config_node_gyp" "$@"
+ fi
+--- a/node_modules/npm-lifecycle/index.js
++++ b/node_modules/npm-lifecycle/index.js
+@@ -15,7 +15,7 @@
+ const byline = require('byline')
+ const resolveFrom = require('resolve-from')
+
+-const DEFAULT_NODE_GYP_PATH = resolveFrom(__dirname, 'node-gyp/bin/node-gyp')
++const DEFAULT_NODE_GYP_PATH = '/usr/bin/node-gyp'
+
+ let PATH = 'PATH'
+
diff --git a/debian/patches/2012_marked_path.patch b/debian/patches/2012_marked_path.patch
new file mode 100644
index 0000000..ad56712
--- /dev/null
+++ b/debian/patches/2012_marked_path.patch
@@ -0,0 +1,45 @@
+Author: Diane Trout <diane@ghic.org>
+Forwarded: not-needed
+Description: Use Debian packaged marked and marked-man to build Documentation
+
+--- a/Makefile
++++ b/Makefile
+@@ -151,13 +151,15 @@
+
+ marked: node_modules/.bin/marked
+
+-node_modules/.bin/marked:
+- node bin/npm-cli.js install marked --no-global --no-timing --no-save
++#node_modules/.bin/marked:
++# node bin/npm-cli.js install marked --no-timing --prefer-offline
++.PHONY: node_modules/.bin/marked
+
+ marked-man: node_modules/.bin/marked-man
+
+-node_modules/.bin/marked-man:
+- node bin/npm-cli.js install marked-man --no-global --no-timing --no-save
++#node_modules/.bin/marked-man:
++# node bin/npm-cli.js install marked-man --no-timing --prefer-offline
++.PHONY: node_modules/.bin/marked-man
+
+ doc: man
+
+--- a/scripts/doc-build.sh
++++ b/scripts/doc-build.sh
+@@ -47,14 +47,14 @@
+
+ case $dest in
+ *.[1357])
+- ./node_modules/.bin/marked-man --roff $src \
++ marked-man --roff $src \
+ | man_replace_tokens > $dest
+ exit $?
+ ;;
+ *.html)
+ url=${dest/html\//}
+ (cat html/dochead.html && \
+- cat $src | ./node_modules/.bin/marked &&
++ cat $src | marked &&
+ cat html/docfoot.html)\
+ | html_replace_tokens $url \
+ > $dest
diff --git a/debian/patches/2013_make_clean_force.patch b/debian/patches/2013_make_clean_force.patch
new file mode 100644
index 0000000..65a62d7
--- /dev/null
+++ b/debian/patches/2013_make_clean_force.patch
@@ -0,0 +1,15 @@
+Description: npm nows chokes on cache clean unless --force is added
+Forwarded: https://github.com/npm/npm/pull/20398
+Last-Update: 2018-21-04
+Author: Jérémy Lal <kapouer@melix.org>
+--- a/Makefile
++++ b/Makefile
+@@ -68,7 +68,7 @@
+
+ clean: markedclean marked-manclean doc-clean
+ rm -rf npmrc
+- node bin/npm-cli.js cache clean
++ node bin/npm-cli.js cache clean --force
+
+ uninstall:
+ node bin/npm-cli.js rm npm -g -f
diff --git a/debian/patches/series b/debian/patches/series
index e757150..c0751ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,10 @@
2001_unicode_in_md.patch
-2002_use_ruby_ronn.patch
2003_fix_doc.patch
2004_remove_shebang.patch
2005_index_build_dont_run_npm.patch
2006_rename_node_to_nodejs.patch
-2007_do_not_require_cmd-shim.patch
-2008_do_not_require_child-process-close.patch
2009_ansi-color-table.patch
2010_privacy_breach_travis.patch
+2011_node-gyp-path.patch
+2012_marked_path.patch
+2013_make_clean_force.patch
diff --git a/debian/rules b/debian/rules
index 81f09d4..d540eee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,36 +4,39 @@
# Uncomment this to turn on verbose mode.
# export DH_VERBOSE=1
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+export HOME=/tmp
-# suppress optional build-dependencies
-CDBS_BUILD_DEPENDS_rules_utils_copyright-check =
+%:
+ dh $@ --with bash-completion
-# Suppress copyright-checking some binaries to not upset dpkg-source
-DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^(html/npm.*\.png|html/favicon\.ico|html/n-.*\.png|debian/(changelog|copyright(|_hints|_newhints))|node_modules/npm-registry-client/node_modules/couch-login/test/fixtures/registry\.couch)$
-
-clean::
- make docclean
-
-build/npm::
+override_dh_auto_build:
make doc
-install/npm::
- dh_bash-completion
+override_dh_auto_clean:
+ -make clean
+ rm -f test/fixtures/config/userconfig-with-gc
-# Fix permissions
-# Remove LICENSE files.
-binary-post-install/npm::
- chmod a-x debian/npm/usr/share/npm/bin/read-package-json.js
+override_dh_clean:
+ dh_clean
+
+override_dh_fixperms:
+ dh_fixperms
chmod a-x debian/npm/usr/share/npm/lib/utils/completion.sh
chmod a-x debian/npm/usr/share/npm/node_modules/uid-number/get-uid-gid.js
- chmod a-x debian/npm/usr/share/npm/node_modules/npmconf/node_modules/config-chain/index.js
- sed -i -e "s|#!/usr/bin/env node|#!/usr/bin/nodejs|" \
- debian/npm/usr/share/npm/node_modules/opener/opener.js \
- debian/npm/usr/share/npm/node_modules/columnify/node_modules/strip-ansi/cli.js
- find debian/npm -name LICENSE -delete
- find debian/npm -name LICENCE -delete
- find debian/npm -name LICENSE.txt -delete
- find debian/npm -name LICENSE.md -delete
-
+ chmod a+x debian/npm/usr/share/npm/bin/npm-cli.js
+
+override_dh_auto_install:
+ # NO OP
+
+override_dh_install:
+ dh_install
+ find debian/npm -iname LICENSE -delete
+ find debian/npm -iname LICENCE -delete
+ find debian/npm -iname LICENSE.txt -delete
+ find debian/npm -iname LICENSE.md -delete
+
+override_dh_auto_test:
+ cp debian/npmrc npmrc
+ # the tests need npm-registry-mock module to run
+ # and some of them fail by design
+ #tap --timeout 240 "test/tap/*.js"
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..1617af8
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,4 @@
+# source is node_modules/columnify/index.js
+npm source: source-is-missing node_modules/columnify/columnify.js line length is 267 characters (>256)
+# false positive
+npm source: source-is-missing node_modules/is-cidr/node_modules/cidr-regex/lib/index.js line length is 1090 characters (>512)
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..c7f5224
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,4 @@
+Test-Command: set -e
+ ; cd "$AUTOPKGTEST_TMP"
+ ; /usr/bin/npm list
+Depends: @
diff --git a/debian/watch b/debian/watch
index 0e0e7d6..2de7a2b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,6 +1,6 @@
version=3
opts=\
-uversionmangle=s/$/+ds/,\
filenamemangle=s/.*\/v?([\d\.-]+)\.tar\.gz/npm-$1.tar.gz/,\
-dversionmangle=s/\+ds$// \
+dversionmangle=s/\+ds$//,\
+repacksuffix=+ds \
https://github.com/isaacs/npm/tags .*/archive/v?([\d\.]+).tar.gz