Your message dated Tue, 12 Mar 2019 13:19:34 +0000
with message-id <e1h3hje-0000ra...@respighi.debian.org>
and subject line unblock node-istanbul
has caused the Debian Bug report #924317,
regarding unblock: node-istanbul/0.4.5+ds-5
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
924317: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=924317
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Hi all,
Please unblock package node-istanbul: a RC bug has been filed just
before freeze deadline. I fixed it in node-istanbul/0.4.5+ds-5.
The debdiff contains:
- switch test to pkg-js-tools and create links on-the-fly during build
- debian/control update to add libjs-prettify in package dependencies
- debian/links update to create links properly
Cheers,
Xavier
unblock node-istanbul/0.4.5+ds-5
-- 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
diff --git a/debian/changelog b/debian/changelog
index 30cf7c5..2870ef2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+node-istanbul (0.4.5+ds-5) unstable; urgency=medium
+
+ * Team upload
+ * Fix changelog install (Closes: #920342)
+ * Switch tests to pkg-js-tools
+ * Add libjs-prettify in dependencies (Closes: #919841)
+ * generate prettify.js links with dh_links
+
+ -- Xavier Guimard <y...@debian.org> Sun, 10 Mar 2019 10:27:57 +0100
+
node-istanbul (0.4.5+ds-4) unstable; urgency=medium
* Team upload
diff --git a/debian/control b/debian/control
index f69e2aa..b0abdea 100644
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,7 @@ Section: javascript
Priority: optional
Maintainer: Debian Javascript Maintainers
<pkg-javascript-de...@lists.alioth.debian.org>
Uploaders: Bastien Roucariès <ro...@debian.org>
+Testsuite: autopkgtest-pkg-nodejs
Build-Depends:
debhelper (>= 12)
, dh-buildinfo
@@ -22,6 +23,7 @@ Build-Depends:
, node-supports-color (>= 3.1.0) <!nocheck>
, node-which (>= 1.1.1) <!nocheck>
, node-wordwrap (>= 1.0.0) <!nocheck>
+ , pkg-js-tools
Standards-Version: 4.3.0
Homepage: https://github.com/gotwarlost/istanbul#readme
Vcs-Git: https://salsa.debian.org/js-team/node-istanbul.git
@@ -31,6 +33,7 @@ Package: node-istanbul
Architecture: all
Depends:
${misc:Depends}
+ , libjs-prettify
, nodejs
, node-abbrev (>= 1.0.0)
, node-async (>= 0.8)
diff --git a/debian/links b/debian/links
index f82d5f6..5fb0f43 100644
--- a/debian/links
+++ b/debian/links
@@ -1 +1,3 @@
usr/lib/nodejs/istanbul/lib/cli.js usr/bin/istanbul
+usr/share/javascript/prettify/prettify.js
usr/lib/nodejs/istanbul/lib/assets/vendor/prettify.js
+usr/share/javascript/prettify/prettify.css
usr/lib/nodejs/istanbul/lib/assets/vendor/prettify.css
diff --git a/debian/rules b/debian/rules
index 1367cc8..99a5ce3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,33 +5,16 @@
#export DH_VERBOSE=1
%:
- dh $@
+ dh $@ --with nodejs
override_dh_auto_clean:
rm -rf lib/assets/vendor
-override_dh_auto_build:
- mkdir -p lib/assets/vendor
- test -f /usr/share/javascript/prettify/prettify.js
- ln -s /usr/share/javascript/prettify/prettify.js
lib/assets/vendor/prettify.js
- test -f /usr/share/javascript/prettify/prettify.css
- ln -s /usr/share/javascript/prettify/prettify.css
lib/assets/vendor/prettify.css
-
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)))
- # smoke test
- lib/cli.js help
-else
- @echo '**********************************************************'
- @echo 'Skip test suite '
- @echo '**********************************************************'
-endif
-
override_dh_fixperms:
dh_fixperms
chmod +x debian/node-istanbul/usr/lib/nodejs/istanbul/lib/cli.js
override_dh_installchangelogs:
# fix mix of html and text
- dh_installchangelogs
+ dh_installchangelogs CHANGELOG.md
sed -i -e 's,</\?t[dr]>,,g' -e 's,</\?ul>,,g' -e 's,</\?li>,,g' -e
's,</\?table>,,g' -e 's/td>//g' -e 's/[ \t]*$$//'
debian/node-istanbul/usr/share/doc/node-istanbul/changelog
diff --git a/debian/tests/control b/debian/tests/control
deleted file mode 100644
index 3fd2b47..0000000
--- a/debian/tests/control
+++ /dev/null
@@ -1,5 +0,0 @@
-Tests: require
-Depends: node-istanbul, nodejs (>= 6)
-
-Tests: smoketest
-Depends: node-istanbul
diff --git a/debian/tests/pkg-js/test b/debian/tests/pkg-js/test
new file mode 100644
index 0000000..0146830
--- /dev/null
+++ b/debian/tests/pkg-js/test
@@ -0,0 +1,13 @@
+SRC=0
+if [ ! -d lib/assets/vendor ]; then
+ mkdir -p lib/assets/vendor
+ ln -s /usr/share/javascript/prettify/prettify.js
lib/assets/vendor/prettify.js
+ ln -s /usr/share/javascript/prettify/prettify.css
lib/assets/vendor/prettify.css
+ SRC=1
+fi
+
+lib/cli.js help
+
+if [ "$SRC" = "1" ]; then
+ rm -rf lib/assets/vendor
+fi
diff --git a/debian/tests/require b/debian/tests/require
deleted file mode 100755
index ab27d0e..0000000
--- a/debian/tests/require
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-set -e
-node -e "require('istanbul');"
diff --git a/debian/tests/smoketest b/debian/tests/smoketest
deleted file mode 100755
index 1553527..0000000
--- a/debian/tests/smoketest
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-set -e
-istanbul help 2>&1
--- End Message ---
--- Begin Message ---
Unblocked node-istanbul.
--- End Message ---
