diff -Nru node-htmlescape-1.1.1/debian/changelog node-htmlescape-1.1.1/debian/changelog
--- node-htmlescape-1.1.1/debian/changelog 2019-09-16 10:10:55.000000000 +0000
+++ node-htmlescape-1.1.1/debian/changelog 2021-08-18 14:37:10.000000000 +0000
@@ -1,3 +1,26 @@
+node-htmlescape (1.1.1-5) unstable; urgency=medium
+
+ * Team upload
+
+ [ Debian Janitor ]
+ * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
+ Repository-Browse.
+ * Apply multi-arch hints.
+ + node-htmlescape: Add Multi-Arch: foreign.
+ * Remove constraints unnecessary since stretch:
+ + Build-Depends: Drop versioned constraint on node-tap.
+
+ [ Yadd ]
+ * Bump debhelper from old 12 to 13.
+ * Declare compliance with policy 4.6.0
+ * Add "Rules-Requires-Root: no"
+ * Add debian/gbp.conf
+ * Fix GitHub tags regex
+ * Fix test for tape ≥ 5
+ * Use dh-sequence-nodejs auto test & install
+
+ -- Yadd Wed, 18 Aug 2021 16:37:10 +0200
+
node-htmlescape (1.1.1-4) unstable; urgency=medium
* Move to /usr/share
diff -Nru node-htmlescape-1.1.1/debian/control node-htmlescape-1.1.1/debian/control
--- node-htmlescape-1.1.1/debian/control 2019-09-16 10:10:06.000000000 +0000
+++ node-htmlescape-1.1.1/debian/control 2021-08-18 14:37:10.000000000 +0000
@@ -3,23 +3,21 @@
Priority: optional
Maintainer: Debian Javascript Maintainers
Uploaders: Bastien Roucariès
-Build-Depends:
- debhelper-compat (= 12)
- , dh-buildinfo
- , dpkg-dev (>= 1.17.14)
- , nodejs (>= 6)
- , node-tape (>= 4.6)
- , node-tap (>= 8)
-Standards-Version: 4.4.0
-Homepage: https://github.com/zertosh/htmlescape
-Vcs-Git: https://salsa.debian.org/js-team/node-htmlescape.git
+Build-Depends: debhelper-compat (= 13)
+ , dh-sequence-nodejs
+ , node-tap
+ , node-tape
+Standards-Version: 4.6.0
Vcs-Browser: https://salsa.debian.org/js-team/node-htmlescape
+Vcs-Git: https://salsa.debian.org/js-team/node-htmlescape.git
+Homepage: https://github.com/zertosh/htmlescape
+Testsuite: autopkgtest-pkg-nodejs
+Rules-Requires-Root: no
Package: node-htmlescape
Architecture: all
-Depends:
- ${misc:Depends}
- , nodejs
+Depends: ${misc:Depends}
+Multi-Arch: foreign
Description: escape string for safe use in html
This module escape a string to be safe for use in html particularly
inside a script tag.
diff -Nru node-htmlescape-1.1.1/debian/copyright node-htmlescape-1.1.1/debian/copyright
--- node-htmlescape-1.1.1/debian/copyright 2019-01-07 01:13:41.000000000 +0000
+++ node-htmlescape-1.1.1/debian/copyright 2021-08-18 14:37:10.000000000 +0000
@@ -31,4 +31,3 @@
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-
diff -Nru node-htmlescape-1.1.1/debian/gbp.conf node-htmlescape-1.1.1/debian/gbp.conf
--- node-htmlescape-1.1.1/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000
+++ node-htmlescape-1.1.1/debian/gbp.conf 2021-08-18 14:36:57.000000000 +0000
@@ -0,0 +1,5 @@
+[DEFAULT]
+pristine-tar = True
+
+[import-orig]
+filter = [ '.gitignore', '.travis.yml', '.git*' ]
diff -Nru node-htmlescape-1.1.1/debian/.git-dpm node-htmlescape-1.1.1/debian/.git-dpm
--- node-htmlescape-1.1.1/debian/.git-dpm 2019-01-07 01:13:42.000000000 +0000
+++ node-htmlescape-1.1.1/debian/.git-dpm 2021-08-18 14:32:32.000000000 +0000
@@ -1,6 +1,6 @@
# see git-dpm(1) from git-dpm package
-431d0905510b83b65d88506fcdad134906e01c1d
-431d0905510b83b65d88506fcdad134906e01c1d
+c378df1835c31fed87dcff035bf076431ac0d07e
+c378df1835c31fed87dcff035bf076431ac0d07e
02dbcc367dd3069b73253ac08d87a40d37984239
02dbcc367dd3069b73253ac08d87a40d37984239
node-htmlescape_1.1.1.orig.tar.gz
diff -Nru node-htmlescape-1.1.1/debian/install node-htmlescape-1.1.1/debian/install
--- node-htmlescape-1.1.1/debian/install 2019-09-16 10:10:15.000000000 +0000
+++ node-htmlescape-1.1.1/debian/install 1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-htmlescape.js usr/share/nodejs/htmlescape/
-package.json usr/share/nodejs/htmlescape/
diff -Nru node-htmlescape-1.1.1/debian/patches/0002-Fix-test-for-tape-5.patch node-htmlescape-1.1.1/debian/patches/0002-Fix-test-for-tape-5.patch
--- node-htmlescape-1.1.1/debian/patches/0002-Fix-test-for-tape-5.patch 1970-01-01 00:00:00.000000000 +0000
+++ node-htmlescape-1.1.1/debian/patches/0002-Fix-test-for-tape-5.patch 2021-08-18 14:34:02.000000000 +0000
@@ -0,0 +1,43 @@
+From c378df1835c31fed87dcff035bf076431ac0d07e Mon Sep 17 00:00:00 2001
+From: Yadd
+Date: Wed, 18 Aug 2021 16:32:09 +0200
+Subject: Fix test for tape ≥ 5
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ test/htmlescape-test.js | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/test/htmlescape-test.js b/test/htmlescape-test.js
+index 6d7eff1..9a89412 100644
+--- a/test/htmlescape-test.js
++++ b/test/htmlescape-test.js
+@@ -15,7 +15,7 @@ test('htmlescape', function(t) {
+
+ t.test('with angle brackets should parse back', function(t) {
+ var evilObj = {evil: ''};
+- t.looseEqual(JSON.parse(htmlescape(evilObj)), evilObj);
++ t.deepEqual(JSON.parse(htmlescape(evilObj)), evilObj);
+ t.end();
+ });
+
+@@ -27,7 +27,7 @@ test('htmlescape', function(t) {
+
+ t.test('with ampersands should parse back', function(t) {
+ var evilObj = {evil: '&'};
+- t.looseEqual(JSON.parse(htmlescape(evilObj)), evilObj);
++ t.deepEqual(JSON.parse(htmlescape(evilObj)), evilObj);
+ t.end();
+ });
+
+@@ -39,7 +39,7 @@ test('htmlescape', function(t) {
+
+ t.test('with "LINE SEPARATOR" and "PARAGRAPH SEPARATOR" should parse back', function(t) {
+ var evilObj = {evil: '\u2028\u2029'};
+- t.looseEqual(JSON.parse(htmlescape(evilObj)), evilObj);
++ t.deepEqual(JSON.parse(htmlescape(evilObj)), evilObj);
+ t.end();
+ });
+
diff -Nru node-htmlescape-1.1.1/debian/patches/series node-htmlescape-1.1.1/debian/patches/series
--- node-htmlescape-1.1.1/debian/patches/series 2019-01-07 01:13:42.000000000 +0000
+++ node-htmlescape-1.1.1/debian/patches/series 2021-08-18 14:32:32.000000000 +0000
@@ -1 +1,2 @@
0001-Skip-test-that-fail-with-newer-node.patch
+0002-Fix-test-for-tape-5.patch
diff -Nru node-htmlescape-1.1.1/debian/rules node-htmlescape-1.1.1/debian/rules
--- node-htmlescape-1.1.1/debian/rules 2019-01-07 01:13:41.000000000 +0000
+++ node-htmlescape-1.1.1/debian/rules 2021-08-18 14:37:10.000000000 +0000
@@ -6,14 +6,3 @@
%:
dh $@
-
-#override_dh_auto_build:
-
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)))
- tap -R spec test/*.js
-else
- @echo '**********************************************************'
- @echo 'Skip test suite '
- @echo '**********************************************************'
-endif
diff -Nru node-htmlescape-1.1.1/debian/salsa-ci.yml node-htmlescape-1.1.1/debian/salsa-ci.yml
--- node-htmlescape-1.1.1/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000
+++ node-htmlescape-1.1.1/debian/salsa-ci.yml 2021-08-18 14:37:01.000000000 +0000
@@ -0,0 +1,4 @@
+---
+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
diff -Nru node-htmlescape-1.1.1/debian/tests/control node-htmlescape-1.1.1/debian/tests/control
--- node-htmlescape-1.1.1/debian/tests/control 2019-01-07 01:13:41.000000000 +0000
+++ node-htmlescape-1.1.1/debian/tests/control 1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-Tests: require
-Depends: node-htmlescape, nodejs (>= 6)
-
-Tests: runtestsuite
-Depends: node-htmlescape, node-tape (>= 4.6), node-tap (>= 8)
diff -Nru node-htmlescape-1.1.1/debian/tests/pkg-js/test node-htmlescape-1.1.1/debian/tests/pkg-js/test
--- node-htmlescape-1.1.1/debian/tests/pkg-js/test 1970-01-01 00:00:00.000000000 +0000
+++ node-htmlescape-1.1.1/debian/tests/pkg-js/test 2021-08-18 14:37:10.000000000 +0000
@@ -0,0 +1 @@
+tap -R spec test/*.js
diff -Nru node-htmlescape-1.1.1/debian/tests/require node-htmlescape-1.1.1/debian/tests/require
--- node-htmlescape-1.1.1/debian/tests/require 2019-01-07 01:13:41.000000000 +0000
+++ node-htmlescape-1.1.1/debian/tests/require 1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-#!/bin/sh
-set -e
-node -e "require('htmlescape');"
diff -Nru node-htmlescape-1.1.1/debian/tests/runtestsuite node-htmlescape-1.1.1/debian/tests/runtestsuite
--- node-htmlescape-1.1.1/debian/tests/runtestsuite 2019-01-07 01:13:41.000000000 +0000
+++ node-htmlescape-1.1.1/debian/tests/runtestsuite 1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-#!/bin/sh
-set -e
-# notice the / at end in order to load this module
-PACKAGE='htmlescape'
-SEDCMD="s,require\s*[(]\s*'[.][.]/?([^']*)'\s*[)],require('$PACKAGE/\1'),g"
-
-tmpdir=$(mktemp -d)
-trap 'rm -rf "$tmpdir"' EXIT INT TERM HUP
-
-cp -r test/ $tmpdir/test
-find test/ -name '*.js' -print0 | \
- xargs -0 -n1 \
- sh -c 'set -e; echo "Create: $3"; sed -E "$1" < "$3" > "$2/$3"' sedtape "$SEDCMD" "$tmpdir"
-# avoid false that does not work outside build dir
-tap -R spec $tmpdir/test/*.js
diff -Nru node-htmlescape-1.1.1/debian/upstream/metadata node-htmlescape-1.1.1/debian/upstream/metadata
--- node-htmlescape-1.1.1/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000
+++ node-htmlescape-1.1.1/debian/upstream/metadata 2021-08-18 14:32:32.000000000 +0000
@@ -0,0 +1,4 @@
+Bug-Database: https://github.com/zertosh/htmlescape/issues
+Bug-Submit: https://github.com/zertosh/htmlescape/issues/new
+Repository: https://github.com/zertosh/htmlescape.git
+Repository-Browse: https://github.com/zertosh/htmlescape
diff -Nru node-htmlescape-1.1.1/debian/watch node-htmlescape-1.1.1/debian/watch
--- node-htmlescape-1.1.1/debian/watch 2019-01-07 01:13:41.000000000 +0000
+++ node-htmlescape-1.1.1/debian/watch 2021-08-18 14:37:10.000000000 +0000
@@ -2,4 +2,4 @@
opts=\
dversionmangle=s/\+(debian|dfsg|ds|deb)(\.\d+)?$//,\
filenamemangle=s/.*\/v?([\d\.-]+)\.tar\.gz/node-htmlescape-$1.tar.gz/ \
- https://github.com/zertosh/htmlescape/tags .*/archive/v?([\d\.]+).tar.gz
+ https://github.com/zertosh/htmlescape/tags .*/archive/.*/v?([\d\.]+).tar.gz