[Pkg-javascript-commits] [node-mkdirp] 03/05: New upstream version

Bastien Roucariès rouca at moszumanska.debian.org
Mon Sep 18 09:17:11 UTC 2017


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

rouca pushed a commit to branch master
in repository node-mkdirp.

commit 2d181a80d8416a93b1a5115fd745b8c53e848ae9
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Fri Sep 15 21:46:13 2017 +0200

    New upstream version
---
 debian/changelog                                   |  9 ++++++
 debian/compat                                      |  2 +-
 debian/control                                     | 11 ++++---
 .../0001-disable-test-that-need-mock-fs.patch      | 37 ++++++++++++++++++++++
 debian/patches/0002-avoid-double-end.patch         | 18 +++++++++++
 debian/patches/series                              |  2 ++
 debian/rules                                       | 10 ++++++
 debian/tests/control                               |  6 ++--
 debian/tests/require                               |  3 ++
 debian/tests/runtestsuite                          | 16 ++++++++++
 debian/watch                                       |  2 +-
 11 files changed, 107 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index de18d09..8b4c1dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+node-mkdirp (0.5.1-1) unstable; urgency=medium
+
+  * Team upload
+  * New upstream version
+  * Bump compat and policy
+  * Run testsuite both during build and using autopkgtest
+
+ -- Bastien Roucariès <rouca at debian.org>  Fri, 15 Sep 2017 21:28:39 +0200
+
 node-mkdirp (0.5.0-1) unstable; urgency=low
 
   [ Andrew Kelley ]
diff --git a/debian/compat b/debian/compat
index 45a4fb7..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+10
diff --git a/debian/control b/debian/control
index 631852b..631886a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,18 +1,19 @@
 Source: node-mkdirp
-Section: web
-Priority: extra
+Section: javascript
+Priority: optional
 Maintainer: Debian Javascript Maintainers <pkg-javascript-devel at lists.alioth.debian.org>
 Uploaders: David Paleino <dapal at debian.org>
  , Jérémy Lal <kapouer at melix.org>
  , Andrew Kelley <superjoe30 at gmail.com>
 Build-Depends:
- debhelper (>= 8)
+ debhelper (>= 10)
  , dh-buildinfo
-Standards-Version: 3.9.5
+ , dpkg-dev (>= 1.17.14)
+ , node-tap (>= 1) <!nocheck>
+Standards-Version: 4.1.0
 Homepage: https://github.com/substack/node-mkdirp
 Vcs-Git: git://anonscm.debian.org/pkg-javascript/node-mkdirp.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-javascript/node-mkdirp.git
-XS-Testsuite: autopkgtest
 
 Package: node-mkdirp
 Architecture: all
diff --git a/debian/patches/0001-disable-test-that-need-mock-fs.patch b/debian/patches/0001-disable-test-that-need-mock-fs.patch
new file mode 100644
index 0000000..c78e37a
--- /dev/null
+++ b/debian/patches/0001-disable-test-that-need-mock-fs.patch
@@ -0,0 +1,37 @@
+Subject: Disable test that need mock-fs
+author: Bastien Roucariès <rouca at debian.org>
+
+Mock-fs is not yet pakaged
+
+Forwarded: no
+Index: node-mkdirp/test/opts_fs.js
+===================================================================
+--- node-mkdirp.orig/test/opts_fs.js
++++ node-mkdirp/test/opts_fs.js
+@@ -1,3 +1,5 @@
++process.exit()
++/*
+ var mkdirp = require('../');
+ var path = require('path');
+ var test = require('tap').test;
+@@ -27,3 +29,4 @@ test('opts.fs', function (t) {
+         });
+     });
+ });
++*/
+Index: node-mkdirp/test/opts_fs_sync.js
+===================================================================
+--- node-mkdirp.orig/test/opts_fs_sync.js
++++ node-mkdirp/test/opts_fs_sync.js
+@@ -1,3 +1,5 @@
++process.exit()
++/*
+ var mkdirp = require('../');
+ var path = require('path');
+ var test = require('tap').test;
+@@ -25,3 +27,4 @@ test('opts.fs sync', function (t) {
+         });
+     });
+ });
++*/
+\ No newline at end of file
diff --git a/debian/patches/0002-avoid-double-end.patch b/debian/patches/0002-avoid-double-end.patch
new file mode 100644
index 0000000..0f4ae2c
--- /dev/null
+++ b/debian/patches/0002-avoid-double-end.patch
@@ -0,0 +1,18 @@
+Subject: avoid double t.end()
+author: Bastien Roucariès <rouca at debian.org>
+
+Recent tap does not like double t.end()
+
+Forwarded: no
+Index: node-mkdirp/test/perm.js
+===================================================================
+--- node-mkdirp.orig/test/perm.js
++++ node-mkdirp/test/perm.js
+@@ -26,7 +26,6 @@ test('async perm', function (t) {
+ test('async root perm', function (t) {
+     mkdirp('/tmp', _0755, function (err) {
+         if (err) t.fail(err);
+-        t.end();
+     });
+     t.end();
+ });
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..65f7f85
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-disable-test-that-need-mock-fs.patch
+0002-avoid-double-end.patch
diff --git a/debian/rules b/debian/rules
index 218df65..b2f5862 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,3 +6,13 @@
 
 %:
 	dh $@
+
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)))
+override_dh_auto_test:
+	tap -R spec test/*.js
+else
+override_dh_auto_test:
+	@echo '**********************************************************'
+	@echo 'Skip test                  '
+	@echo '**********************************************************'
+endif
diff --git a/debian/tests/control b/debian/tests/control
index d25b8f2..6091ae4 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,5 @@
-Test-Command: nodejs -e "require('"'"'mkdirp'"'"');"
-Depends: @
+Tests: require
+Depends: node-mkdirp
 
+Tests: runtestsuite
+Depends: node-mkdirp, node-tap (>=1)
diff --git a/debian/tests/require b/debian/tests/require
new file mode 100755
index 0000000..137deed
--- /dev/null
+++ b/debian/tests/require
@@ -0,0 +1,3 @@
+#!/bin/sh
+set -e
+node -e "require('mkdirp');"
diff --git a/debian/tests/runtestsuite b/debian/tests/runtestsuite
new file mode 100755
index 0000000..3833fa5
--- /dev/null
+++ b/debian/tests/runtestsuite
@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+PACKAGE=mkdirp
+SEDCMD="-e s,require[\(][[\'][.][.]/[\'][\)],require\(\'mkdirp\'\),g"
+
+
+tmpdir=$(mktemp -d)
+trap 'rm -rf "$tmpdir"' EXIT INT TERM HUP
+
+mkdir -p "$tmpdir/test/"
+find test -name '*.js' -print0 | \
+    xargs -n1  -0 \
+	  sh -c 'set -e; echo "TESTING: $3"; sed $1 < $3 > $2/$3' sedtape "$SEDCMD" "$tmpdir"
+
+cd $tmpdir
+tap test/*.js
diff --git a/debian/watch b/debian/watch
index d3ec670..d192d31 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
-version=3
+version=4
 opts=\
 dversionmangle=s/\+(debian|dfsg|ds|deb)(\.\d+)?$//,\
 filenamemangle=s/.*\/v?([\d\.-]+)\.tar\.gz/node-mkdirp-$1.tar.gz/ \

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



More information about the Pkg-javascript-commits mailing list