[Pkg-javascript-commits] [node-stylus] 05/08: Drop patches applied upstream

Mattia Rizzolo mattia at debian.org
Mon May 23 06:29:47 UTC 2016


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

mattia pushed a commit to branch master
in repository node-stylus.

commit 0a63abcafde9bbbf15439bbcf6bda92382c590b9
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Mon May 23 06:16:49 2016 +0000

    Drop patches applied upstream
---
 debian/patches/latest-should-api.patch       | 26 -------------------
 debian/patches/remove-problematic-test.patch | 37 ----------------------------
 debian/patches/series                        |  2 --
 3 files changed, 65 deletions(-)

diff --git a/debian/patches/latest-should-api.patch b/debian/patches/latest-should-api.patch
deleted file mode 100644
index 554308a..0000000
--- a/debian/patches/latest-should-api.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: update should usage to latest API
- stylus depends on should 2.x which is very old and has not accepted this
- patch to update their code to should 4.x
-Author: Andrew Kelley <superjoe30 at gmail.com>
-Forwarded: https://github.com/LearnBoost/stylus/pull/1604
-
---- node-stylus-0.48.1+dfsg.orig/test/middleware/index.js
-+++ node-stylus-0.48.1+dfsg/test/middleware/index.js
-@@ -24,7 +24,7 @@ describe('middleware', function() {
-         dest: __dirname
-       })(req, res, function() {
-         path = __dirname + '/test.css';
--        fs.readFileSync(path).toString().should.include('color: #000');
-+        fs.readFileSync(path).toString().should.containEql('color: #000');
-         fs.unlinkSync(path);
-         done();
-       });
-@@ -39,7 +39,7 @@ describe('middleware', function() {
-         dest: __dirname
-       })(req, res, function() {
-         path = __dirname + '/test.css';
--        fs.readFileSync(path).toString().should.include('sourceMappingURL=');
-+        fs.readFileSync(path).toString().should.containEql('sourceMappingURL=');
-         fs.unlinkSync(path);
-         done();
-       });
diff --git a/debian/patches/remove-problematic-test.patch b/debian/patches/remove-problematic-test.patch
deleted file mode 100644
index 8465d4a..0000000
--- a/debian/patches/remove-problematic-test.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: remove problematic test
- This test was failing due to the test framework not handling nondeterminism
- of JSON data structures. It converts two identical data structures to base64
- and then compares them. Even though the structures are the same, the field
- order is different so the test was failing.
-Author: Andrew Kelley <superjoe30 at gmail.com>
-Forwarded: https://github.com/LearnBoost/stylus/issues/1692
-
---- node-stylus-0.48.1+dfsg.orig/test/run.js
-+++ node-stylus-0.48.1+dfsg/test/run.js
-@@ -54,26 +54,6 @@ addSuite('dependency resolver', readDir(
-   style.deps().join('\n').trim().should.equal(deps);
- });
- 
--// sourcemap cases
--
--addSuite('sourcemap', readDir('test/sourcemap'), function(test){
--  var inline = ~test.indexOf('inline')
--    , path = 'test/sourcemap/' + test + '.styl'
--    , styl = readFile(path)
--    , style = stylus(styl).set('filename', path).set('sourcemap',
--      { inline: inline, sourceRoot: '/', basePath: 'test/sourcemap' })
--    , expected = readFile(path.replace('.styl', inline ? '.css' : '.map'));
--
--  style.render(function(err, css) {
--    if (err) throw err;
--    if (inline) {
--      css.should.equal(expected);
--    } else {
--      JSON.stringify(style.sourcemap).should.equal(expected);
--    }
--  });
--});
--
- // JS API
- 
- describe('JS API', function(){
diff --git a/debian/patches/series b/debian/patches/series
index e3dc8b1..ce42a26 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 nodejs-shebang.patch
-latest-should-api.patch
-remove-problematic-test.patch

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



More information about the Pkg-javascript-commits mailing list