[Pkg-javascript-commits] [SCM] JavaScript parser/mangler/compressor/beautifier library for NodeJS branch, master-experimental, updated. debian/1.3.4-1-12-ga67a0ae

[Jonas Smedegaard]

The following commit has been merged in the master-experimental branch:
commit e041b5fdbe935c39f5a983f13006ef61243d9b31
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Dec 10 00:03:19 2012 +0100

    Adapt patches to upstream rewritten code.

diff --git a/debian/patches/fix_lib_path.patch b/debian/patches/fix_lib_path.patch
index 3c4b8f8..21ad0a8 100644
--- a/debian/patches/fix_lib_path.patch
+++ b/debian/patches/fix_lib_path.patch
@@ -2,30 +2,53 @@ Description: Adapt paths to system-wide install
 Forwarded: not-needed
 Author: Marcelo Jorge Vieira <metal at alucinados.com>
 Author: Jonas Smedegaard <dr at jones.dk>
-Last-Update: 2012-12-06
+Last-Update: 2012-12-10
 
---- a/uglify-js.js
-+++ b/uglify-js.js
-@@ -11,8 +11,8 @@
-   return final_code;
- };
- 
--uglify.parser = require("./lib/parse-js");
--uglify.uglify = require("./lib/process");
--uglify.consolidator = require("./lib/consolidator");
-+uglify.parser = require("./parse-js");
-+uglify.uglify = require("./process");
-+uglify.consolidator = require("./consolidator");
- 
- module.exports = uglify
 --- a/bin/uglifyjs
 +++ b/bin/uglifyjs
 @@ -3,7 +3,7 @@
  
- global.sys = require(/^v0\.[012]/.test(process.version) ? "sys" : "util");
- var fs = require("fs"), path = require("path");
--var uglify = require("../uglify-js"), // symlink ~/.node_libraries/uglify-js.js to ../uglify-js.js
-+var uglify = require("uglify-js"),
-     consolidator = uglify.consolidator,
-     jsp = uglify.parser,
-     pro = uglify.uglify;
+ "use strict";
+ 
+-var UglifyJS = require("../tools/node");
++var UglifyJS = require("uglify-js");
+ var sys = require("util");
+ var optimist = require("optimist");
+ var fs = require("fs");
+--- a/test/run-tests.js
++++ b/test/run-tests.js
+@@ -1,6 +1,6 @@
+ #! /usr/bin/env node
+ 
+-var U = require("../tools/node");
++var U = require("../lib/node");
+ var path = require("path");
+ var fs = require("fs");
+ var assert = require("assert");
+--- a/tools/node.js
++++ b/tools/node.js
+@@ -23,15 +23,15 @@
+ };
+ 
+ var FILES = exports.FILES = [
+-    "../lib/utils.js",
+-    "../lib/ast.js",
+-    "../lib/parse.js",
+-    "../lib/transform.js",
+-    "../lib/scope.js",
+-    "../lib/output.js",
+-    "../lib/compress.js",
+-    "../lib/sourcemap.js",
+-    "../lib/mozilla-ast.js"
++    "./utils.js",
++    "./ast.js",
++    "./parse.js",
++    "./transform.js",
++    "./scope.js",
++    "./output.js",
++    "./compress.js",
++    "./sourcemap.js",
++    "./mozilla-ast.js"
+ ].map(function(file){
+     return path.join(path.dirname(fs.realpathSync(__filename)), file);
+ });
diff --git a/debian/patches/node_conflict.patch b/debian/patches/node_conflict.patch
index ec117ca..a0a12bc 100644
--- a/debian/patches/node_conflict.patch
+++ b/debian/patches/node_conflict.patch
@@ -1,8 +1,16 @@
 --- a/bin/uglifyjs
 +++ b/bin/uglifyjs
 @@ -1,4 +1,4 @@
--#!/usr/bin/env node
-+#!/usr/bin/env nodejs
+-#! /usr/bin/env node
++#! /usr/bin/nodejs
  // -*- js -*-
  
- global.sys = require(/^v0\.[012]/.test(process.version) ? "sys" : "util");
+ "use strict";
+--- a/test/run-tests.js
++++ b/test/run-tests.js
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env node
++#! /usr/bin/nodejs
+ 
+ var U = require("../lib/node");
+ var path = require("path");

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