[Pkg-javascript-commits] [uglifyjs] 04/04: refresh patch

[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 49745e19485c7db6291b4191def7e44d3c5a451c
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Nov 27 13:38:40 2016 +0530

    refresh patch
---
 debian/patches/1001_break_dep_loop.patch | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/debian/patches/1001_break_dep_loop.patch b/debian/patches/1001_break_dep_loop.patch
index a0da040..9bc112a 100644
--- a/debian/patches/1001_break_dep_loop.patch
+++ b/debian/patches/1001_break_dep_loop.patch
@@ -47,14 +47,14 @@ Index: uglifyjs/tools/node.js
      return fs.readFileSync(file, "utf8");
  }).join("\n\n"))(
 -    require("source-map"),
-+    sourceMap),
++    sourceMap,
      UglifyJS,
      !!global.UGLIFY_DEBUG
  );
-@@ -118,17 +124,21 @@ exports.minify = function(files, options
+@@ -119,18 +125,22 @@ exports.minify = function(files, options
          inMap = JSON.parse(fs.readFileSync(options.inSourceMap, "utf8"));
      }
-     if (options.outSourceMap) {
+     if (options.outSourceMap || options.sourceMapInline) {
 -        output.source_map = UglifyJS.SourceMap({
 -            file: options.outSourceMap,
 -            orig: inMap,
@@ -64,6 +64,7 @@ Index: uglifyjs/tools/node.js
 -            for (var file in sourcesContent) {
 -                if (sourcesContent.hasOwnProperty(file)) {
 -                    output.source_map.get().setSourceContent(file, sourcesContent[file]);
+-                }
 +        if (sourceMap) {
 +            output.source_map = UglifyJS.SourceMap({
 +                file: options.outSourceMap,
@@ -75,10 +76,12 @@ Index: uglifyjs/tools/node.js
 +                    if (sourcesContent.hasOwnProperty(file)) {
 +                        output.source_map.get().setSourceContent(file, sourcesContent[file]);
 +                    }
-                 }
++               }
              }
-+        } else {
-+            console.error("source-map module is missing and needed by outSourceMap option");
-         }
+-        }
++	} else {
++	    console.error("source-map module is missing and needed by outSourceMap option");
++	}
  
      }
+     if (options.output) {

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