[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 3f25997a4c7dee92f70949b7e08fd9240ccc331f
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Dec 7 19:56:47 2012 +0100

    Refresh patches with shortening quilt options.

diff --git a/debian/patches/fix_lib_path.patch b/debian/patches/fix_lib_path.patch
index dfff335..3c4b8f8 100644
--- a/debian/patches/fix_lib_path.patch
+++ b/debian/patches/fix_lib_path.patch
@@ -4,10 +4,8 @@ Author: Marcelo Jorge Vieira <metal at alucinados.com>
 Author: Jonas Smedegaard <dr at jones.dk>
 Last-Update: 2012-12-06
 
-Index: uglifyjs/uglify-js.js
-===================================================================
---- uglifyjs.orig/uglify-js.js	2012-09-29 15:50:12.000000000 -0300
-+++ uglifyjs/uglify-js.js	2012-09-29 15:52:54.000000000 -0300
+--- a/uglify-js.js
++++ b/uglify-js.js
 @@ -11,8 +11,8 @@
    return final_code;
  };
@@ -20,8 +18,8 @@ Index: uglifyjs/uglify-js.js
 +uglify.consolidator = require("./consolidator");
  
  module.exports = uglify
---- uglifyjs-1.3.3.orig/bin/uglifyjs
-+++ uglifyjs-1.3.3/bin/uglifyjs
+--- a/bin/uglifyjs
++++ b/bin/uglifyjs
 @@ -3,7 +3,7 @@
  
  global.sys = require(/^v0\.[012]/.test(process.version) ? "sys" : "util");
diff --git a/debian/patches/node_conflict.patch b/debian/patches/node_conflict.patch
index 3260e60..ec117ca 100644
--- a/debian/patches/node_conflict.patch
+++ b/debian/patches/node_conflict.patch
@@ -1,7 +1,5 @@
-Index: uglifyjs/bin/uglifyjs
-===================================================================
---- uglifyjs.orig/bin/uglifyjs	2012-09-29 15:52:32.000000000 -0300
-+++ uglifyjs/bin/uglifyjs	2012-09-29 15:55:34.000000000 -0300
+--- a/bin/uglifyjs
++++ b/bin/uglifyjs
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env node
 +#!/usr/bin/env nodejs

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