[Python-modules-commits] [jupyter-notebook] 04/04: 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 2449e2a69c4fb5ae0ec53a7b801b2276c326f94b
Merge: 32bcfff 9b510df
Author: Gordon Ball <gordon at chronitis.net>
Date:   Mon Nov 7 19:03:47 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...0004-jquery-ui-1.12-compatibility-changes.patch | 82 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 notebook/static/notebook/js/outputarea.js          |  3 +-
 notebook/static/notebook/js/pager.js               |  3 +-
 notebook/templates/page.html                       |  4 --
 tools/build-main.js                                |  1 -
 7 files changed, 89 insertions(+), 9 deletions(-)

diff --cc debian/.git-dpm
index 9cc6500,0000000..c27d5e5
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
- 4c4469cbcf4c59364f4bf116064e750159314f60
- 4c4469cbcf4c59364f4bf116064e750159314f60
++9b510df313b8367e9b8fe47a5946dcf2b5c5be7d
++9b510df313b8367e9b8fe47a5946dcf2b5c5be7d
 +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/0004-jquery-ui-1.12-compatibility-changes.patch
index 0000000,0000000..8ffab0f
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-jquery-ui-1.12-compatibility-changes.patch
@@@ -1,0 -1,0 +1,82 @@@
++From 9b510df313b8367e9b8fe47a5946dcf2b5c5be7d Mon Sep 17 00:00:00 2001
++From: Gordon Ball <gordon at chronitis.net>
++Date: Mon, 7 Nov 2016 19:02:34 +0100
++Subject: jquery-ui 1.12 compatibility changes
++
++---
++ notebook/static/notebook/js/outputarea.js | 3 ++-
++ notebook/static/notebook/js/pager.js      | 3 ++-
++ notebook/templates/page.html              | 4 ----
++ tools/build-main.js                       | 1 -
++ 4 files changed, 4 insertions(+), 7 deletions(-)
++
++diff --git a/notebook/static/notebook/js/outputarea.js b/notebook/static/notebook/js/outputarea.js
++index 97d9583..812d01d 100644
++--- a/notebook/static/notebook/js/outputarea.js
+++++ b/notebook/static/notebook/js/outputarea.js
++@@ -2,13 +2,14 @@
++ // Distributed under the terms of the Modified BSD License.
++ 
++ define([
+++    'jquery',
++     'jquery-ui',
++     'base/js/utils',
++     'base/js/security',
++     'base/js/keyboard',
++     'notebook/js/mathjaxutils',
++     'components/marked/lib/marked',
++-], function($, utils, security, keyboard, mathjaxutils, marked) {
+++], function($, ___, utils, security, keyboard, mathjaxutils, marked) {
++     "use strict";
++ 
++     /**
++diff --git a/notebook/static/notebook/js/pager.js b/notebook/static/notebook/js/pager.js
++index cb9bf32..172ad60 100644
++--- a/notebook/static/notebook/js/pager.js
+++++ b/notebook/static/notebook/js/pager.js
++@@ -2,9 +2,10 @@
++ // Distributed under the terms of the Modified BSD License.
++ 
++ define([
+++    'jquery',
++     'jquery-ui',
++     'base/js/utils',
++-], function($, utils) {
+++], function($, ___, utils) {
++     "use strict";
++ 
++     var Pager = function (pager_selector, options) {
++diff --git a/notebook/templates/page.html b/notebook/templates/page.html
++index 3e03e85..19f69bd 100644
++--- a/notebook/templates/page.html
+++++ b/notebook/templates/page.html
++@@ -66,7 +66,6 @@
++             },
++             "jquery-ui": {
++               deps: ["jquery"],
++-              exports: "$"
++             }
++           },
++           waitSeconds: 30,
++@@ -92,9 +91,6 @@
++           return window.$;
++       });
++ 
++-      define("jquery-ui", function () {
++-          return window.$;
++-      });
++       // error-catching custom.js shim.
++       define("custom", function (require, exports, module) {
++           try {
++diff --git a/tools/build-main.js b/tools/build-main.js
++index 3336159..0f33034 100644
++--- a/tools/build-main.js
+++++ b/tools/build-main.js
++@@ -53,7 +53,6 @@ var rjs_config = {
++     },
++     "jquery-ui": {
++       deps: ["jquery"],
++-      exports: "$"
++     }
++   },
++ 
diff --cc debian/patches/series
index c18d4c9,0000000..5462fc7
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,4 @@@
 +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

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