[Pkg-javascript-commits] [node-yarnpkg] 01/01: contrib release: install gulp & friends with npm

[Paolo Greppi]

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

paolog-guest pushed a commit to branch debian-contrib
in repository node-yarnpkg.

commit ba431b0e3af2d9b64a20f2d7ac5829d3c9000792
Author: Paolo Greppi <paolo.greppi at libpf.com>
Date:   Wed Sep 20 10:47:45 2017 +0200

    contrib release: install gulp & friends with npm
---
 debian/changelog                  |  4 ++--
 debian/control                    |  7 ++-----
 debian/install                    |  2 +-
 debian/patches/07-gulp-babel.diff | 26 --------------------------
 debian/patches/07-lib-legacy.diff | 15 +++++++++++++++
 debian/patches/series             |  2 +-
 debian/rules                      |  7 +++++--
 7 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2232065..55a2e98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-node-yarnpkg (0.18.1-1) UNRELEASED; urgency=low
+node-yarnpkg (0.18.1-1) unstable; urgency=low
 
   * Initial release (Closes: #843021)
 
- -- Paolo Greppi <paolo.greppi at libpf.com>  Sun, 25 Dec 2016 07:31:18 +0000
+ -- Paolo Greppi <paolo.greppi at libpf.com>  Mon, 26 Dec 2016 16:12:36 +0100
diff --git a/debian/control b/debian/control
index 4413f77..62b9cba 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: node-yarnpkg
-Section: web
+Section: contrib/web
 Priority: optional
 Maintainer: Debian Javascript Maintainers <pkg-javascript-devel at lists.alioth.debian.org>
 Uploaders: Paolo Greppi <paolo.greppi at libpf.com>
@@ -7,10 +7,7 @@ Build-Depends:
  debhelper (>= 9)
  , dh-buildinfo
  , node-marked-man
- , gulp
- , node-gulp-plumber
- , node-gulp-sourcemaps
- , node-gulp-util
+ , npm
  , nodejs
 Standards-Version: 3.9.8
 Homepage: https://github.com/yarnpkg/yarn#readme
diff --git a/debian/install b/debian/install
index 986572b..1e6b53d 100644
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,4 @@
 *.js usr/lib/nodejs/yarn/
 package.json usr/lib/nodejs/yarn/
-lib-legacy usr/lib/nodejs/yarn/
+debian/lib-legacy usr/lib/nodejs/yarn/
 bin/yarn.js usr/lib/nodejs/yarn/bin
diff --git a/debian/patches/07-gulp-babel.diff b/debian/patches/07-gulp-babel.diff
deleted file mode 100644
index 6e642a6..0000000
--- a/debian/patches/07-gulp-babel.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Temporarily disable babel transpiling.
-Forwarded: not-needed
-Author: Paolo Greppi <paolo.greppi at libpf.com>
-
-Index: node-yarnpkg/gulpfile.js
-===================================================================
---- node-yarnpkg.orig/gulpfile.js
-+++ node-yarnpkg/gulpfile.js
-@@ -3,7 +3,7 @@
- const argv = require('yargs').argv;
- const plumber = require('gulp-plumber');
- const newer = require('gulp-newer');
--const babel = require('gulp-babel');
-+// const babel = require('gulp-babel');
- const sourcemaps = require('gulp-sourcemaps');
- const gutil = require('gulp-util');
- const gulp = require('gulp');
-@@ -21,7 +21,7 @@ function build(lib, opts) {
-     }))
-     .pipe(newer(lib))
-     .pipe(sourcemaps.init())
--    .pipe(babel(opts))
-+//    .pipe(babel(opts))
-     .pipe(sourcemaps.write('.'))
-     .pipe(gulp.dest(lib));
- }
diff --git a/debian/patches/07-lib-legacy.diff b/debian/patches/07-lib-legacy.diff
new file mode 100644
index 0000000..c3ca26d
--- /dev/null
+++ b/debian/patches/07-lib-legacy.diff
@@ -0,0 +1,15 @@
+Description: Write to a temporary location
+Forwarded: not-needed
+Author: Paolo Greppi <paolo.greppi at libpf.com>
+
+Index: node-yarnpkg/gulpfile.js
+===================================================================
+--- node-yarnpkg.orig/gulpfile.js
++++ node-yarnpkg/gulpfile.js
+@@ -35,5 +35,5 @@ gulp.task('build-modern', () => {
+ });
+ 
+ gulp.task('build-legacy', () => {
+-  return build('lib-legacy', babelRc.env['pre-node5']);
++  return build('debian/lib-legacy', babelRc.env['pre-node5']);
+ });
diff --git a/debian/patches/series b/debian/patches/series
index 9defdc0..c574f4e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,4 @@
 04-user-home.diff
 05-gulp-watch.diff
 06-gulp-if.diff
-07-gulp-babel.diff
+07-lib-legacy.diff
diff --git a/debian/rules b/debian/rules
index 169d197..7e1c282 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,9 @@
 
 override_dh_auto_build:
 	marked-man --version v0.18.1 --section 1 --manual 'yarnpkg man page' --date="$(shell dpkg-parsechangelog --show-field=Date)" debian/yarnpkg.md > debian/yarnpkg.1
-	gulp build-legacy
-	dh_auto_build
+	npm install gulp gulp-plumber gulp-newer gulp-babel gulp-sourcemaps gulp-util pretty-hrtime chalk liftoff tildify interpret v8flags minimist yargs babel-plugin-transform-inline-imports-commonjs babel-plugin-transform-runtime babel-preset-es2015-node4 babel-preset-node5 babel-preset-stage-0
+	sed -i 's/^#!.usr.bin.env node/#!\/usr\/bin\/env nodejs/g' ./node_modules/gulp/bin/gulp.js
+	node_modules/gulp/bin/gulp.js build-legacy
 
 override_dh_fixperms:
 	dh_fixperms
@@ -19,5 +20,7 @@ override_dh_fixperms:
 override_dh_clean:
 	dh_clean
 	rm -f debian/yarnpkg.1
+	rm -rf node_modules
+	rm -rf debian/lib-legacy
 
 #override_dh_auto_test:

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