← Back to branch summary

~ubuntu-branches/ubuntu/vivid/nodejs/vivid

« back to all changes in this revision

Viewing changes to debian/patches/2001_FHS_paths_for_nodejs.patch

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2012-02-09 15:01:27 UTC
  • mfrom: (7.1.18 sid)
  • Revision ID: package-import@ubuntu.com-20120209150127-iiz4z20pppqpu9if
Tags: 0.4.12-3ubuntu1
* Merge from Debian unstable:
  - This package is x86/arm only. Update control to match
  - Drop 2007_remove_internet_test.patch, update
    2005_expected_failing_tests.patch instead:
    + Allow test-dgram-multicast to fail, requires root privileges.
    + Allow test-c-ares, test-regress-GH-819 and test-net-connect-timeout to
      fail, they require network access.
* Rebuild with new version of libv8.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/2001_FHS_paths_for_nodejs.patch
56
56
 t = join(w, 'Tools')
57
57
--- a/lib/module.js
58
58
+++ b/lib/module.js
59
 
@@ -422,7 +422,7 @@
 
59
@@ -431,7 +431,7 @@
60
60
 };
61
61
 
62
62
 Module._initPaths = function() {
63
63
-  var paths = [path.resolve(process.execPath, '..', '..', 'lib', 'node')];
64
 
+  var paths = ['/usr/local/lib/nodejs', '/usr/lib/nodejs'];
 
64
+  var paths = ['/usr/lib/nodejs'];
65
65
 
66
66
   if (process.env['HOME']) {
67
67
     paths.unshift(path.resolve(process.env['HOME'], '.node_libraries'));