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

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit 037654907d8fb6a07a777568184c24589ae64050
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Dec 7 19:55:27 2012 +0100

    Consistently adjust only actually used files in node_conflict patch, as already partly done (accidentally?) in 1.3.3-1.

diff --git a/debian/patches/node_conflict.patch b/debian/patches/node_conflict.patch
index 3d7bdb0..3260e60 100644
--- a/debian/patches/node_conflict.patch
+++ b/debian/patches/node_conflict.patch
@@ -8,23 +8,3 @@ Index: uglifyjs/bin/uglifyjs
  // -*- js -*-
  
  global.sys = require(/^v0\.[012]/.test(process.version) ? "sys" : "util");
-Index: uglifyjs/test/beautify.js
-===================================================================
---- uglifyjs.orig/test/beautify.js	2012-07-31 20:37:48.000000000 -0300
-+++ uglifyjs/test/beautify.js	2012-09-29 15:55:34.000000000 -0300
-@@ -1,4 +1,4 @@
--#! /usr/bin/env node
-+#! /usr/bin/env nodejs
- 
- global.sys = require("sys");
- var fs = require("fs");
-Index: uglifyjs/tmp/test.js
-===================================================================
---- uglifyjs.orig/tmp/test.js	2012-07-31 20:37:48.000000000 -0300
-+++ uglifyjs/tmp/test.js	2012-09-29 15:55:34.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");

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