[Python-modules-commits] [jupyter-notebook] 02/03: 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 da4b73ee97b3e03ef8cc33ef8e01533da13313ec
Merge: 3d8cb48 a67cb72
Author: Gordon Ball <gordon at chronitis.net>
Date:   Sun Nov 19 15:29:29 2017 +0000

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../0009-Add-requirejs-shim-for-xterm.patch        | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 tools/build-main.js                                |  3 +++
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 3e7186e,0000000..bba2cfb
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
- 6c3e5d02a6ae5acfeddfcc994bf5feb0e078bcb1
- 6c3e5d02a6ae5acfeddfcc994bf5feb0e078bcb1
++a67cb72d067f60ea5588afc8e729246090a84ff3
++a67cb72d067f60ea5588afc8e729246090a84ff3
 +2d11329b4c2d8c690d320bfe7a7cf98c12d84b1b
 +2d11329b4c2d8c690d320bfe7a7cf98c12d84b1b
 +jupyter-notebook_5.2.1.orig.tar.gz
 +11aa557251c85ffaa52d0b79204ee4eef5e22d3c
 +5662374
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0009-Add-requirejs-shim-for-xterm.patch
index 0000000,0000000..5da668b
new file mode 100644
--- /dev/null
+++ b/debian/patches/0009-Add-requirejs-shim-for-xterm.patch
@@@ -1,0 -1,0 +1,26 @@@
++From a67cb72d067f60ea5588afc8e729246090a84ff3 Mon Sep 17 00:00:00 2001
++From: Gordon Ball <gordon at chronitis.net>
++Date: Sun, 19 Nov 2017 15:28:09 +0000
++Subject: Add requirejs shim for xterm
++
++The xtermjs package (as of 2.7.0+ds1-1) doesn't appear to export an
++object, AMD-style. This adds a shim to retrieve `window.Terminal` so
++that `require(["xterm"], ...)` will hopefully work.
++---
++ tools/build-main.js | 3 +++
++ 1 file changed, 3 insertions(+)
++
++diff --git a/tools/build-main.js b/tools/build-main.js
++index 37f74cb..b800749 100644
++--- a/tools/build-main.js
+++++ b/tools/build-main.js
++@@ -57,6 +57,9 @@ var rjs_config = {
++     "jquery-ui": {
++       deps: ["jquery"],
++     },
+++    xterm: {
+++      exports: "Terminal"
+++    },
++   },
++ 
++   exclude: [
diff --cc debian/patches/series
index d731e88,0000000..3141cbf
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,8 -1,0 +1,9 @@@
 +0001-Nodejs-binary-and-import-names.patch
 +0002-Use-local-MathJax-in-documentation.patch
 +0003-Unmask-setuptools-in-setup.py-so-dependencies-are-de.patch
 +0004-jquery-ui-1.12-compatibility-changes.patch
 +0005-Call-lessc-with-source-map-basepath-option-for-repro.patch
 +0006-Work-around-https-github.com-less-less.js-pull-3002.patch
 +0007-Debian-specific-hack-to-fix-upstream-s-non-increment.patch
 +0008-Ignore-errors-in-documentation-notebooks-during-buil.patch
++0009-Add-requirejs-shim-for-xterm.patch

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