[Pkg-javascript-commits] [SCM] JavaScript parser/mangler/compressor/beautifier library for NodeJS branch, master, updated. debian/1.0.4-1-31-gd4ce8f2

[Marcelo Jorge Vieira]

The following commit has been merged in the master branch:
commit 69008756e4638e594d1fe282837179dedb9c06c9
Author: Marcelo Jorge Vieira <metal at alucinados.com>
Date:   Tue Jul 31 19:26:20 2012 -0300

    Node conflict
    
    For more info, see:
    http://lists.debian.org/debian-devel-announce/2012/07/msg00002.html

diff --git a/debian/patches/node_conflict.patch b/debian/patches/node_conflict.patch
new file mode 100644
index 0000000..25351e6
--- /dev/null
+++ b/debian/patches/node_conflict.patch
@@ -0,0 +1,35 @@
+--- uglifyjs.orig/bin/uglifyjs	2012-07-31 19:24:04.000000000 -0300
++++ uglifyjs/bin/uglifyjs	2012-07-31 19:24:13.000000000 -0300
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env node
++#!/usr/bin/env nodejs
+ // -*- js -*-
+ 
+ global.sys = require(/^v0\.[012]/.test(process.version) ? "sys" : "util");
+
+--- uglifyjs.orig/test/testparser.js	2012-07-31 19:29:59.000000000 -0300
++++ uglifyjs/test/testparser.js	2012-07-31 19:30:08.000000000 -0300
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env node
++#! /usr/bin/env nodejs
+ 
+ var parseJS = require("../lib/parse-js");
+ var sys = require("sys");
+
+--- uglifyjs.orig/test/beautify.js	2012-07-31 19:32:44.000000000 -0300
++++ uglifyjs/test/beautify.js	2012-07-31 19:33:02.000000000 -0300
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env node
++#! /usr/bin/env nodejs
+ 
+ global.sys = require("sys");
+ var fs = require("fs");
+
+--- uglifyjs.orig/tmp/test.js	2012-07-31 19:35:10.000000000 -0300
++++ uglifyjs/tmp/test.js	2012-07-31 19:35:16.000000000 -0300
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env node
++#! /usr/bin/env nodejs
+ 
+ global.sys = require(/^v0\.[012]/.test(process.version) ? "sys" : "util");
+ var fs = require("fs");
diff --git a/debian/patches/series b/debian/patches/series
index de2d58a..9da4119 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix_lib_path.patch
+node_conflict.patch

-- 
JavaScript parser/mangler/compressor/beautifier library for NodeJS