[Pkg-javascript-commits] [node-resolve] 04/06: Imported Debian patch 1.1.7-1
Thorsten Alteholz
alteholz at moszumanska.debian.org
Fri Jun 17 17:57:32 UTC 2016
This is an automated email from the git hooks/post-receive script.
alteholz pushed a commit to branch master
in repository node-resolve.
commit afcf73485ae70343e4eaae6608b949dfc92bc88b
Merge: 79e3431 dd7fd14
Author: Thorsten Alteholz <debian at alteholz.de>
Date: Sun Jun 12 21:33:25 2016 +0200
Imported Debian patch 1.1.7-1
debian/changelog | 7 +-
debian/compat | 2 +-
debian/control | 31 ++--
debian/copyright | 51 +++---
debian/docs | 2 +-
debian/examples | 1 -
debian/install | 3 +-
debian/lintian-overrides | 2 +
debian/rules | 7 +
debian/tests/control | 2 +
debian/tests/require | 3 +
debian/watch | 7 +-
lib/async.js | 183 ++++++++++++++-------
lib/caller.js | 8 +
lib/node-modules-paths.js | 38 +++++
lib/sync.js | 40 ++---
package.json | 53 +++---
readme.markdown | 32 +++-
test/core.js | 2 +-
test/dotdot.js | 29 ++++
test/dotdot/abc/index.js | 2 +
test/dotdot/index.js | 1 +
test/faulty_basedir.js | 17 ++
test/filter.js | 7 +-
test/filter_sync.js | 2 +-
test/mock.js | 90 +++++++++-
test/mock_sync.js | 2 +-
test/module_dir.js | 56 +++++++
test/module_dir/xmodules/aaa/index.js | 1 +
test/module_dir/ymodules/aaa/index.js | 1 +
test/module_dir/zmodules/bbb/main.js | 1 +
test/module_dir/zmodules/bbb/package.json | 3 +
test/node_path.js | 48 ++++++
test/node_path/x/aaa/index.js | 1 +
test/node_path/x/ccc/index.js | 1 +
test/node_path/y/bbb/index.js | 1 +
test/node_path/y/ccc/index.js | 1 +
test/nonstring.js | 9 +
test/pathfilter.js | 35 ++++
test/pathfilter/deep_ref/main.js | 0
test/pathfilter/deep_ref/node_modules/deep/alt.js | 0
.../deep_ref/node_modules/deep/deeper/ref.js | 0
.../deep_ref/node_modules/deep/package.json | 4 +
test/pathfilter/deep_ref/node_modules/deep/ref.js | 0
test/precedence.js | 23 +++
test/precedence/aaa.js | 1 +
test/precedence/aaa/index.js | 1 +
test/precedence/aaa/main.js | 1 +
test/precedence/bbb.js | 1 +
test/precedence/bbb/main.js | 1 +
test/resolver.js | 175 +++++++++++++++++---
test/resolver/biz/node_modules/garply/lib/index.js | 1 +
test/resolver/biz/node_modules/garply/package.json | 3 +
test/resolver/incorrect_main/index.js | 2 +
test/resolver/incorrect_main/package.json | 3 +
.../punycode/node_modules/punycode/index.js | 0
test/resolver/quux/foo/index.js | 1 +
test/resolver/without_basedir/main.js | 6 +
.../without_basedir/node_modules/mymodule.js | 1 +
test/resolver_sync.js | 25 ++-
test/subdirs.js | 13 ++
test/subdirs/node_modules/a/b/c/x.json | 1 +
test/subdirs/node_modules/a/package.json | 1 +
63 files changed, 838 insertions(+), 208 deletions(-)
diff --cc debian/changelog
index c8e9cc8,0000000..9f14b6b
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,0 +1,6 @@@
- node-resolve (0.3.1-1) unstable; urgency=low
++node-resolve (1.1.7-1) unstable; urgency=medium
+
- * Initial release (Closes: #707132).
++ * Initial release
++
++ -- Thorsten Alteholz <debian at alteholz.de> Sun, 12 Jun 2016 21:33:25 +0200
+
- -- Mike Gabriel <sunweaver at debian.org> Tue, 07 May 2013 20:09:05 +0200
diff --cc debian/compat
index 45a4fb7,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 8
++9
diff --cc debian/control
index 3ad3366,0000000..7273cf3
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,22 -1,0 +1,25 @@@
+Source: node-resolve
+Section: web
- Priority: extra
++Priority: optional
+Maintainer: Debian Javascript Maintainers <pkg-javascript-devel at lists.alioth.debian.org>
- Uploaders:
- Mike Gabriel <sunweaver at debian.org>,
++Uploaders: Thorsten Alteholz <debian at alteholz.de>
+Build-Depends:
- debhelper (>= 8.0.0),
- dh-buildinfo,
- Standards-Version: 3.9.4
- Homepage: https://github.com/substack/node-resolve
- Vcs-Git: git://git.debian.org/collab-maint/node-resolve.git
- Vcs-Browser: http://git.debian.org/?p=collab-maint/node-resolve.git
++ debhelper (>= 9)
++ , dh-buildinfo
++ , nodejs
++Standards-Version: 3.9.8
++Homepage: https://github.com/substack/node-resolve#readme
++Vcs-Git: https://anonscm.debian.org/git/pkg-javascript/node-resolve.git
++Vcs-Browser: https://anonscm.debian.org/cgit/pkg-javascript/node-resolve.git
+
+Package: node-resolve
+Architecture: all
+Depends:
- ${misc:Depends},
- nodejs (>= 0.8),
- Description: Synchronous/Asynchronous require.resolve() algorithm
- Implements the node require.resolve() algorithm such that you can
- require.resolve() on behalf of a file asynchronously and synchronously.
++ ${misc:Depends}
++ , nodejs
++Description: resolve like require.resolve() on behalf of files
++ This module implements the node require.resolve() algorithm such
++ that you can require.resolve() on behalf of a file asynchronously
++ and synchronously
++ .
++ Node.js is an event-based server-side JavaScript engine.
diff --cc debian/copyright
index 077c111,0000000..b21605d
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,33 -1,0 +1,34 @@@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
- Upstream-Name: node-resolve
- Upstream-Contact:
- Source: https://github.com/substack/node-resolve
++Upstream-Name: resolve
++Upstream-Contact: https://github.com/substack/node-resolve/issues
++Source: https://github.com/substack/node-resolve#readme
+
+Files: *
- Copyright:
- 2011-2013, James Halliday <mail at substack.net>
- License: MIT
++Copyright: 2016 James Halliday <mail at substack.net> (http://substack.net)
++License: Expat
+
+Files: debian/*
- Copyright:
- 2013, Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
- License: MIT
++Copyright: 2016 Thorsten Alteholz <debian at alteholz.de>
++License: Expat
+
- License: MIT
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
++License: Expat
++ Permission is hereby granted, free of charge, to any person
++ obtaining a copy of this software and associated documentation files
++ (the "Software"), to deal in the Software without restriction,
++ including without limitation the rights to use, copy, modify, merge,
++ publish, distribute, sublicense, and/or sell copies of the Software,
++ and to permit persons to whom the Software is furnished to do so,
++ subject to the following conditions:
+ .
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
++ The above copyright notice and this permission notice shall be
++ included in all copies or substantial portions of the Software.
+ .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN 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.
++ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
++ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
++ 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 --cc debian/docs
index aa479b8,0000000..3a89ff9
mode 100644,000000..100644
--- a/debian/docs
+++ b/debian/docs
@@@ -1,1 -1,0 +1,1 @@@
- readme.markdown
++readme.markdown
diff --cc debian/install
index 1177b64,0000000..c8bc9cb
mode 100644,000000..100644
--- a/debian/install
+++ b/debian/install
@@@ -1,2 -1,0 +1,3 @@@
- *.js usr/lib/nodejs/resolve/
++package.json usr/lib/nodejs/resolve/
+lib usr/lib/nodejs/resolve/
++index.js usr/lib/nodejs/resolve/
diff --cc debian/lintian-overrides
index 0000000,0000000..13ccc95
new file mode 100644
--- /dev/null
+++ b/debian/lintian-overrides
@@@ -1,0 -1,0 +1,2 @@@
++# this is not the file from libjs-async
++embedded-javascript-library usr/lib/nodejs/resolve/lib/async.js please use libjs-async
diff --cc debian/rules
index 218df65,0000000..de57af0
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,8 -1,0 +1,15 @@@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+ dh $@
++
++#override_dh_auto_build:
++
++#override_dh_auto_test:
++
++
++
diff --cc debian/tests/control
index 0000000,0000000..e559eba
new file mode 100644
--- /dev/null
+++ b/debian/tests/control
@@@ -1,0 -1,0 +1,2 @@@
++Tests: require
++Depends: node-resolve
diff --cc debian/tests/require
index 0000000,0000000..7058b07
new file mode 100644
--- /dev/null
+++ b/debian/tests/require
@@@ -1,0 -1,0 +1,3 @@@
++#!/bin/sh
++set -e
++nodejs -e "require('resolve');"
diff --cc debian/watch
index a6ac72b,0000000..68a21ac
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,4 -1,0 +1,5 @@@
+version=3
- opts=filenamemangle=s/.*\/v?([\d\.-]+)\.tar\.gz/node-resolve-$1.tar.gz/ \
- https://github.com/substack/node-resolve/tags .*/archive/v?([\d\.]+).tar.gz
-
++opts=\
++dversionmangle=s/\+(debian|dfsg|ds|deb)(\.\d+)?$//,\
++filenamemangle=s/.*\/v?([\d\.-]+)\.tar\.gz/node-resolve-$1.tar.gz/ \
++ https://github.com/substack/node-resolve/tags .*/archive/v?([\d\.]+).tar.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-resolve.git
More information about the Pkg-javascript-commits
mailing list