diff -Nru node-livescript-1.5.0+dfsg/debian/changelog node-livescript-1.5.0+dfsg/debian/changelog --- node-livescript-1.5.0+dfsg/debian/changelog 2016-12-18 10:34:05.000000000 +0000 +++ node-livescript-1.5.0+dfsg/debian/changelog 2018-01-03 22:47:18.000000000 +0000 @@ -1,14 +1,9 @@ -node-livescript (1.5.0+dfsg-3build2) zesty; urgency=medium +node-livescript (1.5.0+dfsg-4) unstable; urgency=medium - * Revert to Debian packaging (LP: #1644894) + * Upstream fix a regexp failure test with node > 6 + * Drop nodejs renaming from patch - -- Jeremy Bicha Sun, 18 Dec 2016 05:34:05 -0500 - -node-livescript (1.5.0+dfsg-3build1) zesty; urgency=medium - - * Bootstrap - - -- Jeremy Bicha Tue, 13 Dec 2016 20:32:14 -0500 + -- Jérémy Lal Wed, 03 Jan 2018 23:47:18 +0100 node-livescript (1.5.0+dfsg-3) unstable; urgency=medium diff -Nru node-livescript-1.5.0+dfsg/debian/patches/46bed9ec3d67805062ab982d5ac0b918710e5ac3.patch node-livescript-1.5.0+dfsg/debian/patches/46bed9ec3d67805062ab982d5ac0b918710e5ac3.patch --- node-livescript-1.5.0+dfsg/debian/patches/46bed9ec3d67805062ab982d5ac0b918710e5ac3.patch 1970-01-01 00:00:00.000000000 +0000 +++ node-livescript-1.5.0+dfsg/debian/patches/46bed9ec3d67805062ab982d5ac0b918710e5ac3.patch 2018-01-03 22:39:38.000000000 +0000 @@ -0,0 +1,40 @@ +From 46bed9ec3d67805062ab982d5ac0b918710e5ac3 Mon Sep 17 00:00:00 2001 +From: Ryan Hendrickson +Date: Tue, 24 Jan 2017 21:12:57 -0500 +Subject: [PATCH] fix gkz/LiveScript#946 + +--- + test/regex.ls | 23 ++++++++++++++++++++--- + 1 file changed, 20 insertions(+), 3 deletions(-) + +diff --git a/test/regex.ls b/test/regex.ls +index 20d8804d..8f8acf76 100644 +--- a/test/regex.ls ++++ b/test/regex.ls +@@ -94,6 +94,23 @@ eq \string typeof /^$/$ + eq \string typeof //^$//$ + eq \string typeof //^#{''}$//$ + +-eq /\\\//$ /\\\//source +-eq //\\\///$ //\\\///source +-eq //#{\\}\///$ //#{\\}\///source ++# [gkz/LiveScript#946](https://github.com/gkz/LiveScript/issues/946) ++# It's almost, but not quite true, that $ is equivalent to a more efficient ++# .source. What $ actually does is return the string that LiveScript would be ++# passing to the RegExp constructor, were the $ flag absent. There are some cases ++# where a LiveScript regular expression literal can correspond to a source string ++# that is not as fully escaped as a standards-compliant implementation of .source ++# would produce, yet is close enough to feed to RegExp anyway. In such cases, ++# the $-flagged expression will be different than the result of .source. (The ++# third test case below is such an example.) Note also that the implementation ++# of .source may vary based on the JS engine this test is running on; earlier ++# versions of Node.js would return .source strings with less escaping than modern ++# engines. For these reasons, it's important to always compare a .source with ++# another .source in these tests, instead of comparing the $-flagged expression ++# to .source as previous versions of these tests did. ++ ++source-eq = (s, r) -> eq new RegExp(s).source, r.source ++ ++source-eq /\\\//$ /\\\// ++source-eq //\\\///$ //\\\/// ++source-eq //#{\\}\///$ //#{\\}\/// diff -Nru node-livescript-1.5.0+dfsg/debian/patches/series node-livescript-1.5.0+dfsg/debian/patches/series --- node-livescript-1.5.0+dfsg/debian/patches/series 2016-12-18 10:34:05.000000000 +0000 +++ node-livescript-1.5.0+dfsg/debian/patches/series 2018-01-03 22:39:38.000000000 +0000 @@ -1,3 +1,4 @@ use_nodejs.patch use-system-libs.patch disable-npm.patch +46bed9ec3d67805062ab982d5ac0b918710e5ac3.patch diff -Nru node-livescript-1.5.0+dfsg/debian/patches/use_nodejs.patch node-livescript-1.5.0+dfsg/debian/patches/use_nodejs.patch --- node-livescript-1.5.0+dfsg/debian/patches/use_nodejs.patch 2016-12-18 10:34:05.000000000 +0000 +++ node-livescript-1.5.0+dfsg/debian/patches/use_nodejs.patch 2018-01-03 22:39:09.000000000 +0000 @@ -1,8 +1,6 @@ -Index: node-livescript/Makefile -=================================================================== ---- node-livescript.orig/Makefile -+++ node-livescript/Makefile -@@ -43,7 +43,7 @@ full: +--- a/Makefile ++++ b/Makefile +@@ -43,7 +43,7 @@ make force && make force && make test && make coverage install: build @@ -11,16 +9,7 @@ dev-install: package.json npm install . -@@ -52,7 +52,7 @@ test: build - ./scripts/test - - test-harmony: build -- node --harmony ./scripts/test -+ nodejs --harmony ./scripts/test - - coverage: build - $(ISTANBUL) cover ./scripts/test -@@ -61,8 +61,8 @@ loc: +@@ -61,8 +61,8 @@ wc --lines src/* clean: @@ -33,32 +22,3 @@ rm -rf coverage - rm -f package.json +# rm -f package.json -Index: node-livescript/bin/lsc -=================================================================== ---- node-livescript.orig/bin/lsc -+++ node-livescript/bin/lsc -@@ -1,4 +1,4 @@ --#!/usr/bin/env node -+#!/usr/bin/env nodejs - - var path = require('path'), - fs = require('fs'), -Index: node-livescript/scripts/test -=================================================================== ---- node-livescript.orig/scripts/test -+++ node-livescript/scripts/test -@@ -1,4 +1,4 @@ --#!/usr/bin/env node -+#!/usr/bin/env nodejs - - (function() { - var fs = require("fs"); -Index: node-livescript/scripts/build-parser -=================================================================== ---- node-livescript.orig/scripts/build-parser -+++ node-livescript/scripts/build-parser -@@ -1,3 +1,3 @@ --#!/usr/bin/env node -+#!/usr/bin/env nodejs - - console.log(require("../lib/grammar").generate());