[Pkg-javascript-commits] [node-tar-stream] 04/06: refresh readable-stream patch and add dependency on node-xtend which is now in Debian

[Paolo Greppi]

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

paolog-guest pushed a commit to branch master
in repository node-tar-stream.

commit 9039334d00068b796a434e1f547efc44d617694f
Author: Paolo Greppi <paolo.greppi at libpf.com>
Date:   Tue Nov 29 12:54:35 2016 +0000

    refresh readable-stream patch and add dependency on node-xtend which is now in Debian
---
 debian/control                          |  1 +
 debian/patches/00-readable_stream.patch | 37 +++++++++++++++++++++++++++++++
 debian/patches/readable_stream.patch    | 37 -------------------------------
 debian/patches/series                   |  3 +--
 debian/patches/xtend_module.patch       | 39 ---------------------------------
 5 files changed, 39 insertions(+), 78 deletions(-)

diff --git a/debian/control b/debian/control
index 70c57da..31b9973 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Depends:
  , node-bl (>= 0.8.1)
  , node-end-of-stream (>= 0.1.3)
  , node-utils-merge (>= 3.0.0)
+ , node-xtend (>= 4.0.0)
 Description: streaming tar parser and generator - Node.js module
  tar-stream is a Node.js module which provides a streaming API to parse and
  generate tar files. It is streams2 and operates purely using streams which
diff --git a/debian/patches/00-readable_stream.patch b/debian/patches/00-readable_stream.patch
new file mode 100644
index 0000000..080729c
--- /dev/null
+++ b/debian/patches/00-readable_stream.patch
@@ -0,0 +1,37 @@
+Description: readable-stream is only needed for node.js 0.8 compat
+Author:
+ Andrew Kelley <superjoe30 at gmail.com>,
+ Paolo Greppi <paolo.greppi at libpf.com>
+Forwarded: not-needed
+Last-Update: 2016-11-29
+
+Index: node-tar-stream/extract.js
+===================================================================
+--- node-tar-stream.orig/extract.js
++++ node-tar-stream/extract.js
+@@ -3,8 +3,8 @@ var bl = require('bl')
+ var xtend = require('xtend')
+ var headers = require('./headers')
+ 
+-var Writable = require('readable-stream').Writable
+-var PassThrough = require('readable-stream').PassThrough
++var Writable = require('stream').Writable
++var PassThrough = require('stream').PassThrough
+ 
+ var noop = function () {}
+ 
+Index: node-tar-stream/pack.js
+===================================================================
+--- node-tar-stream.orig/pack.js
++++ node-tar-stream/pack.js
+@@ -2,8 +2,8 @@ var constants = require('constants')
+ var eos = require('end-of-stream')
+ var util = require('util')
+ 
+-var Readable = require('readable-stream').Readable
+-var Writable = require('readable-stream').Writable
++var Readable = require('stream').Readable
++var Writable = require('stream').Writable
+ var StringDecoder = require('string_decoder').StringDecoder
+ 
+ var headers = require('./headers')
diff --git a/debian/patches/readable_stream.patch b/debian/patches/readable_stream.patch
deleted file mode 100644
index e5f3b4b..0000000
--- a/debian/patches/readable_stream.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: readable-stream is only needed for node.js 0.8 compat
-Author: Andrew Kelley <superjoe30 at gmail.com>
-Forwarded: not-needed
-Last-Update: 2014-06-29
-
-Index: node-tar-stream/extract.js
-===================================================================
---- node-tar-stream.orig/extract.js	2014-06-30 07:05:30.229646504 +0000
-+++ node-tar-stream/extract.js	2014-06-30 07:05:35.000000000 +0000
-@@ -3,8 +3,8 @@
- var xtend = require('xtend');
- var headers = require('./headers');
- 
--var Writable = require('readable-stream').Writable;
--var PassThrough = require('readable-stream').PassThrough;
-+var Writable = require('stream').Writable;
-+var PassThrough = require('stream').PassThrough;
- 
- var noop = function() {};
- 
-Index: node-tar-stream/pack.js
-===================================================================
---- node-tar-stream.orig/pack.js	2014-06-30 07:05:30.229646504 +0000
-+++ node-tar-stream/pack.js	2014-06-30 07:05:35.000000000 +0000
-@@ -2,9 +2,9 @@
- var eos = require('end-of-stream');
- var headers = require('./headers');
- 
--var Readable = require('readable-stream').Readable;
--var Writable = require('readable-stream').Writable;
--var PassThrough = require('readable-stream').PassThrough;
-+var Readable = require('stream').Readable;
-+var Writable = require('stream').Writable;
-+var PassThrough = require('stream').PassThrough;
- 
- var END_OF_TAR = new Buffer(1024);
- END_OF_TAR.fill(0);
diff --git a/debian/patches/series b/debian/patches/series
index be68a02..eef8b66 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-readable_stream.patch
-xtend_module.patch
+00-readable_stream.patch
diff --git a/debian/patches/xtend_module.patch b/debian/patches/xtend_module.patch
deleted file mode 100644
index d1ce111..0000000
--- a/debian/patches/xtend_module.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: embed the xtend module
-Author: Andrew Kelley <superjoe30 at gmail.com>
-Forwarded: not-needed
-Last-Update: 2014-06-30
-
---- node-tar-stream-0.4.3.orig/extract.js
-+++ node-tar-stream-0.4.3/extract.js
-@@ -1,10 +1,9 @@
- var util = require('util');
- var bl = require('bl');
--var xtend = require('xtend');
- var headers = require('./headers');
- 
- var Writable = require('stream').Writable;
- var PassThrough = require('stream').PassThrough;
- 
- var noop = function() {};
- 
- 
-@@ -192,3 +191,19 @@ Extract.prototype._write = function(data
- };
- 
- module.exports = Extract;
-+
-+function xtend() {
-+    var target = {}
-+
-+    for (var i = 0; i < arguments.length; i++) {
-+        var source = arguments[i]
-+
-+        for (var key in source) {
-+            if (source.hasOwnProperty(key)) {
-+                target[key] = source[key]
-+            }
-+        }
-+    }
-+
-+    return target
-+}

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