[Python-modules-commits] [jupyter-notebook] 07/08: merge patched into master

[Gordon Ball]

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

chronitis-guest pushed a commit to branch master
in repository jupyter-notebook.

commit d5de85320541aa4d4d5ffb6c78346d4a3c275570
Merge: adc9cb7 10f4945
Author: Gordon Ball <gordon at chronitis.net>
Date:   Mon Oct 24 14:39:56 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../0001-Nodejs-binary-and-import-names.patch      | 38 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setupbase.py                                       |  2 +-
 tools/build-main.js                                |  2 +-
 5 files changed, 43 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 300ae02,0000000..9eb7eb0
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 1b789b6b3bfdc79fa5ba90dd5aa3dadd3ce542eb
- 1b789b6b3bfdc79fa5ba90dd5aa3dadd3ce542eb
++10f494574090f1cd92304d3c5949951f7c34f09a
++10f494574090f1cd92304d3c5949951f7c34f09a
 +1b789b6b3bfdc79fa5ba90dd5aa3dadd3ce542eb
 +1b789b6b3bfdc79fa5ba90dd5aa3dadd3ce542eb
 +jupyter-notebook_4.2.3.orig.tar.gz
 +cd42c2013047d2722d3990db4787820cff51cbc8
 +4456566
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Nodejs-binary-and-import-names.patch
index 0000000,0000000..a7518a9
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Nodejs-binary-and-import-names.patch
@@@ -1,0 -1,0 +1,38 @@@
++From 10f494574090f1cd92304d3c5949951f7c34f09a Mon Sep 17 00:00:00 2001
++From: Gordon Ball <gordon at chronitis.net>
++Date: Mon, 24 Oct 2016 14:38:07 +0200
++Subject: Nodejs binary and import names
++
++ * Binary node -> nodejs
++ * Import requirejs -> r
++---
++ setupbase.py        | 2 +-
++ tools/build-main.js | 2 +-
++ 2 files changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/setupbase.py b/setupbase.py
++index 62d4e63..a411c9b 100644
++--- a/setupbase.py
+++++ b/setupbase.py
++@@ -476,7 +476,7 @@ class CompileJS(Command):
++             log.info("%s up to date" % target)
++             return
++         log.info("Rebuilding %s" % target)
++-        run(['node', 'tools/build-main.js', name])
+++        run(['nodejs', 'tools/build-main.js', name])
++ 
++     def run(self):
++         self.run_command('jsdeps')
++diff --git a/tools/build-main.js b/tools/build-main.js
++index bd0316b..3336159 100644
++--- a/tools/build-main.js
+++++ b/tools/build-main.js
++@@ -1,7 +1,7 @@
++ // build main.min.js
++ // spawned by gulp to allow parallelism
++ 
++-var rjs = require('requirejs').optimize;
+++var rjs = require('r').optimize;
++ 
++ var name = process.argv[2];
++ 
diff --cc debian/patches/series
index 0000000,0000000..c94e8d9
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Nodejs-binary-and-import-names.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/jupyter-notebook.git