[Pkg-javascript-commits] [uglifyjs] 06/07: refresh patches

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository uglifyjs.

commit d9837b24837dc658f829c7b9b80d670d7b008675
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Sep 5 12:38:48 2016 +0530

    refresh patches
---
 debian/changelog                         |  1 +
 debian/patches/1001_break_dep_loop.patch | 74 +++++++++++++++++++-------------
 debian/patches/2002_node_conflict.patch  | 16 ++++---
 3 files changed, 54 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ac71490..f0f30ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ uglifyjs (2.7.3-1) UNRELEASED; urgency=medium
   * Team upload
   * New upstream version (Closes: #836722)
   * Drop patch: 020150722~905b601.patch (included upstream)
+  * Refresh patches
 
  -- Pirate Praveen <praveen at debian.org>  Mon, 05 Sep 2016 12:15:11 +0530
 
diff --git a/debian/patches/1001_break_dep_loop.patch b/debian/patches/1001_break_dep_loop.patch
index d828bed..a0da040 100644
--- a/debian/patches/1001_break_dep_loop.patch
+++ b/debian/patches/1001_break_dep_loop.patch
@@ -3,44 +3,56 @@ Forwarded: https://github.com/mishoo/UglifyJS2/pull/477
 Author: Jérémy Lal <kapouer at melix.org>
 Last-Update: 2014-05-02
 
---- a/package.json
-+++ b/package.json
-@@ -16,10 +16,12 @@
-     },
-     "dependencies": {
-         "async"      : "~0.2.6",
--        "source-map" : "0.1.34",
-         "optimist"   : "~0.3.5",
-         "uglify-to-browserify": "~1.0.0"
-     },
-+    "optionalDependencies": {
-+        "source-map" : "0.1.34"
+Index: uglifyjs/package.json
+===================================================================
+--- uglifyjs.orig/package.json
++++ uglifyjs/package.json
+@@ -30,7 +30,6 @@
+   ],
+   "dependencies": {
+     "async": "~0.2.6",
+-    "source-map": "~0.5.1",
+     "uglify-to-browserify": "~1.0.0",
+     "yargs": "~3.10.0"
+   },
+@@ -41,6 +40,9 @@
+     "estraverse": "~1.5.1",
+     "mocha": "~2.3.4"
+   },
++  "optionalDependencies": {
++    "source-map": "~0.5.1"
 +    },
-     "browserify": {
-         "transform": [ "uglify-to-browserify" ]
-     },
---- a/tools/node.js
-+++ b/tools/node.js
-@@ -2,11 +2,16 @@
+   "browserify": {
+     "transform": [
+       "uglify-to-browserify"
+Index: uglifyjs/tools/node.js
+===================================================================
+--- uglifyjs.orig/tools/node.js
++++ uglifyjs/tools/node.js
+@@ -7,6 +7,12 @@
+ var path = require("path");
  var fs = require("fs");
- var vm = require("vm");
- var sys = require("util");
+ 
 +var sourceMap;
 +try {
 +	sourceMap = require("source-map");
 +} catch(e) {
 +}
- 
- var UglifyJS = vm.createContext({
-     sys           : sys,
-     console       : console,
--    MOZ_SourceMap : require("source-map")
-+    MOZ_SourceMap : sourceMap
- });
- 
- function load_global(file) {
-@@ -107,17 +112,21 @@
-         inMap = fs.readFileSync(options.inSourceMap, "utf8");
++
+ var FILES = exports.FILES = [
+     "../lib/utils.js",
+     "../lib/ast.js",
+@@ -28,7 +34,7 @@ var UglifyJS = exports;
+ new Function("MOZ_SourceMap", "exports", "DEBUG", FILES.map(function(file){
+     return fs.readFileSync(file, "utf8");
+ }).join("\n\n"))(
+-    require("source-map"),
++    sourceMap),
+     UglifyJS,
+     !!global.UGLIFY_DEBUG
+ );
+@@ -118,17 +124,21 @@ exports.minify = function(files, options
+         inMap = JSON.parse(fs.readFileSync(options.inSourceMap, "utf8"));
      }
      if (options.outSourceMap) {
 -        output.source_map = UglifyJS.SourceMap({
diff --git a/debian/patches/2002_node_conflict.patch b/debian/patches/2002_node_conflict.patch
index 9ed6e3e..a813d0a 100644
--- a/debian/patches/2002_node_conflict.patch
+++ b/debian/patches/2002_node_conflict.patch
@@ -6,19 +6,23 @@ Author: Marcelo Jorge Vieira <metal at alucinados.com>
 Author: Jonas Smedegaard <dr at jones.dk>
 Last-Update: 2012-12-10
 
---- a/bin/uglifyjs
-+++ b/bin/uglifyjs
+Index: uglifyjs/bin/uglifyjs
+===================================================================
+--- uglifyjs.orig/bin/uglifyjs
++++ uglifyjs/bin/uglifyjs
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env node
 +#! /usr/bin/nodejs
  // -*- js -*-
  
  "use strict";
---- a/test/run-tests.js
-+++ b/test/run-tests.js
+Index: uglifyjs/test/run-tests.js
+===================================================================
+--- uglifyjs.orig/test/run-tests.js
++++ uglifyjs/test/run-tests.js
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env node
 +#! /usr/bin/nodejs
  
- var U = require("../tools/node");
- var path = require("path");
+ global.UGLIFY_DEBUG = true;
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/uglifyjs.git