[Pkg-javascript-commits] [node-encoding] 01/02: Remove patch to use iconv instead of iconv-lite.

[Mathias Behrle]

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

mbehrle pushed a commit to branch master
in repository node-encoding.

commit 4592219b89d0df48eb192e23e60b61a79a636ffa
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Sep 18 15:06:16 2016 +0200

    Remove patch to use iconv instead of iconv-lite.
    
    node-iconv-lite was packaged in the meantime, so we can use it directly.
---
 debian/control                    |  2 +-
 debian/patches/01-use-iconv.patch | 16 ----------------
 debian/patches/series             |  1 -
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/debian/control b/debian/control
index beaacb1..e9b7f2f 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-javascript/node-encoding.git
 Package: node-encoding
 Architecture: all
 Depends:
- node-iconv,
+ node-iconv-lite,
  nodejs,
  ${misc:Depends},
 Description: Convert encodings, uses iconv by default and fallbacks to iconv-lite if needed
diff --git a/debian/patches/01-use-iconv.patch b/debian/patches/01-use-iconv.patch
deleted file mode 100644
index b7bb07e..0000000
--- a/debian/patches/01-use-iconv.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Use iconv instead of iconv-lite
- encoding can use iconv instead of iconv-lite. So we just comment
- the require and depend on iconv, which is available in the archive.
-Author: Mathias Behrle <mbehrle at debian.org>
-Forwarded: not-needed
-
---- node-encoding-0.1.12.orig/lib/encoding.js
-+++ node-encoding-0.1.12/lib/encoding.js
-@@ -1,6 +1,6 @@
- 'use strict';
- 
--var iconvLite = require('iconv-lite');
-+// var iconvLite = require('iconv-lite');
- // Load Iconv from an external file to be able to disable Iconv for webpack
- // Add /\/iconv-loader$/ to webpack.IgnorePlugin to ignore it
- var Iconv = require('./iconv-loader');
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 9d7f262..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01-use-iconv.patch

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