[Pkg-javascript-commits] [grunt] 01/01: remove remove-encoding-conversion.patch

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository grunt.

commit 4bb48040131cc814aa7d9d57fdc919bd2cd935bb
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Nov 14 21:15:45 2016 +0530

    remove remove-encoding-conversion.patch
    
    fixed in node-iconv-lite
---
 debian/patches/remove-encoding-conversion.patch | 30 -------------------------
 debian/patches/series                           |  1 -
 2 files changed, 31 deletions(-)

diff --git a/debian/patches/remove-encoding-conversion.patch b/debian/patches/remove-encoding-conversion.patch
deleted file mode 100644
index bfb1057..0000000
--- a/debian/patches/remove-encoding-conversion.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: grunt/lib/grunt/file.js
-===================================================================
---- grunt.orig/lib/grunt/file.js
-+++ grunt/lib/grunt/file.js
-@@ -223,11 +223,11 @@ file.read = function(filepath, options)
-   grunt.verbose.write('Reading ' + filepath + '...');
-   try {
-     contents = fs.readFileSync(String(filepath));
--    // If encoding is not explicitly null, convert from encoded buffer to a
-+  /*  // If encoding is not explicitly null, convert from encoded buffer to a
-     // string. If no encoding was specified, use the default.
-     if (options.encoding !== null) {
-       contents = iconv.decode(contents, options.encoding || file.defaultEncoding, {stripBOM: !file.preserveBOM});
--    }
-+    }*/
-     grunt.verbose.ok();
-     return contents;
-   } catch (e) {
-@@ -276,9 +276,9 @@ file.write = function(filepath, contents
-   try {
-     // If contents is already a Buffer, don't try to encode it. If no encoding
-     // was specified, use the default.
--    if (!Buffer.isBuffer(contents)) {
-+/*    if (!Buffer.isBuffer(contents)) {
-       contents = iconv.encode(contents, options.encoding || file.defaultEncoding);
--    }
-+    }*/
-     // Actually write file.
-     if (!nowrite) {
-       fs.writeFileSync(filepath, contents, 'mode' in options ? {mode: options.mode} : {});
diff --git a/debian/patches/series b/debian/patches/series
index 0912358..b963fdd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 fix-nodejs.patch
 add-root-variable.patch
-remove-encoding-conversion.patch

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