[Pkg-javascript-devel] Bug#925614: unblock: node-external-editor/2.0.4+dfsg-2
Xavier Guimard
yadd at debian.org
Wed Mar 27 15:16:06 GMT 2019
Package: release.debian.org
Severity: normal
User: release.debian.org at packages.debian.org
Usertags: unblock
Please unblock package node-external-editor
Hi all,
node-external-editor autopkgtest test fails due to a deprecation warning
in mocha [1].
I updated test to test generated files instead of coffee ones (and so avoid
using "--compilers" deprecated option). Other changes are:
- use pkg-js-tools and autopkgtest-pkg-nodejs to launch tests
- declare compliance with policy 4.3.0
- add debian/upstream/metadata
- use debian/clean instead of override_dh_clean
I kept debhelper compatibility level to 9.
There are no reverse build dependencies on node-external-editor
Reverse dependencies are:
Reverse Depends:
node-inquirer
node-inquirer
Reverse Depends:
yarnpkg
yarnpkg
Reverse Depends:
gitlab
Since there is nothing changed on installed files, I think it is not
risky to unblock node-external-editor.
Cheers,
Xavier
[1]: https://ci.debian.net/data/packages/unstable/amd64/n/node-external-editor/latest-autopkgtest/log.gz
unblock node-external-editor/2.0.4+dfsg-2
-- System Information:
Debian Release: buster/sid
APT prefers testing
APT policy: (600, 'testing'), (50, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.14.0-3-amd64 (SMP w/2 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE= (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
-------------- next part --------------
diff --git a/debian/changelog b/debian/changelog
index 4fcf856..232b616 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+node-external-editor (2.0.4+dfsg-2) unstable; urgency=medium
+
+ * Team upload
+
+ [ Paolo Greppi ]
+ * Update Vcs fields for migration to https://salsa.debian.org/
+
+ [ Xavier Guimard ]
+ * Add upstream/metadata
+ * Update debian/copyright format URL
+ * Test: replace the use of deprecated "--compilers" by a test on generated
+ files (fixes debci)
+ * Use debian/clean instead of an override
+ * Declare compliance with policy 4.3.0
+
+ -- Xavier Guimard <yadd at debian.org> Wed, 27 Mar 2019 16:03:23 +0100
+
node-external-editor (2.0.4+dfsg-1) unstable; urgency=medium
* Team upload
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..9f9cf9e
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+main/
+test/spec/main.js
diff --git a/debian/control b/debian/control
index d813e55..5a5bb74 100644
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,7 @@ Section: javascript
Priority: optional
Maintainer: Debian Javascript Maintainers <pkg-javascript-devel at lists.alioth.debian.org>
Uploaders: Paolo Greppi <paolo.greppi at libpf.com>
+Testsuite: autopkgtest-pkg-nodejs
Build-Depends:
debhelper (>= 9)
, dh-buildinfo
@@ -13,10 +14,11 @@ Build-Depends:
, node-iconv-lite
, node-jschardet
, nodejs
-Standards-Version: 4.1.3
+ , pkg-js-tools
+Standards-Version: 4.3.0
Homepage: https://github.com/mrkmg/node-external-editor#readme
-Vcs-Git: https://anonscm.debian.org/git/pkg-javascript/node-external-editor.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-javascript/node-external-editor.git
+Vcs-Git: https://salsa.debian.org/js-team/node-external-editor.git
+Vcs-Browser: https://salsa.debian.org/js-team/node-external-editor
Package: node-external-editor
Architecture: all
diff --git a/debian/copyright b/debian/copyright
index 7042d08..b800224 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: external-editor
Upstream-Contact: https://github.com/mrkmg/node-external-editor/issues
Source: https://github.com/mrkmg/node-external-editor#readme
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8f3fe4c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use-compiled-files-for-mocha.diff
diff --git a/debian/patches/use-compiled-files-for-mocha.diff b/debian/patches/use-compiled-files-for-mocha.diff
new file mode 100644
index 0000000..aaed51a
--- /dev/null
+++ b/debian/patches/use-compiled-files-for-mocha.diff
@@ -0,0 +1,18 @@
+Description: replace mocha compiler use by test on compiled files
+ This avoid to use --compilers option which is deprecated.
+ See https://github.com/mochajs/mocha/wiki/compilers-deprecation
+Author: Xavier Guimard <yadd at debian.org>
+Forwarded: not-needed
+Last-Update: 2019-03-27
+
+--- a/test/spec/main.coffee
++++ b/test/spec/main.coffee
+@@ -2,7 +2,7 @@
+ readFileSync = require('fs').readFileSync
+ writeFileSync = require('fs').writeFileSync
+ IConvLite = require 'iconv-lite'
+-ExternalEditor = require('../../src')
++ExternalEditor = require('../../main')
+
+ describe 'main', ->
+ before ->
diff --git a/debian/rules b/debian/rules
index 215f601..0205278 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,15 +5,8 @@
#export DH_VERBOSE=1
%:
- dh $@
+ dh $@ --with nodejs
override_dh_auto_build:
coffee --compile --output main/ src/
dh_auto_build
-
-override_dh_clean:
- dh_clean
- rm -rf main
-
-override_dh_auto_test:
- mocha --recursive --compilers coffee:coffee-script/register --timeout 10000 ./test/spec -R spec
diff --git a/debian/tests/control b/debian/tests/control
deleted file mode 100644
index 0518855..0000000
--- a/debian/tests/control
+++ /dev/null
@@ -1,5 +0,0 @@
-Tests: require
-Depends: node-external-editor
-
-Test-Command: mocha --recursive --compilers coffee:coffee-script/register --timeout 10000 ./test/spec -R spec
-Depends: @, @builddeps@
diff --git a/debian/tests/pkg-js/test b/debian/tests/pkg-js/test
new file mode 100644
index 0000000..e829f00
--- /dev/null
+++ b/debian/tests/pkg-js/test
@@ -0,0 +1,3 @@
+coffee -c --output test/spec/ test/spec/main.coffee
+mocha --recursive --timeout 10000 ./test/spec -R spec
+rm -f test/spec/main.js
diff --git a/debian/tests/require b/debian/tests/require
deleted file mode 100644
index dfe60a9..0000000
--- a/debian/tests/require
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-set -e
-nodejs -e "require('external-editor');"
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..793bfa1
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,7 @@
+---
+Archive: GitHub
+Bug-Database: https://github.com/mrkmg/node-external-editor/issues
+Contact: https://github.com/mrkmg/node-external-editor/issues
+Name: node-external-editor
+Repository: https://github.com/mrkmg/node-external-editor.git
+Repository-Browse: https://github.com/mrkmg/node-external-editor
More information about the Pkg-javascript-devel
mailing list