[Python-modules-commits] [jupyter-notebook] 03/09: 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 b40b846cb4bb632490ba6fc1b04b4b8405cf1a2e
Merge: c4ddb96 4c4469c
Author: Gordon Ball <gordon at chronitis.net>
Date:   Fri Oct 28 12:03:05 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...ptools-in-setup.py-so-dependencies-are-de.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  3 +--
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 4df9764,0000000..9cc6500
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
- c1d77748a9887228746fe7467464ccec38cca8f5
- c1d77748a9887228746fe7467464ccec38cca8f5
++4c4469cbcf4c59364f4bf116064e750159314f60
++4c4469cbcf4c59364f4bf116064e750159314f60
 +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/0003-Unmask-setuptools-in-setup.py-so-dependencies-are-de.patch
index 0000000,0000000..18ba4f2
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Unmask-setuptools-in-setup.py-so-dependencies-are-de.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 4c4469cbcf4c59364f4bf116064e750159314f60 Mon Sep 17 00:00:00 2001
++From: Gordon Ball <gordon at chronitis.net>
++Date: Fri, 28 Oct 2016 12:02:40 +0200
++Subject: Unmask setuptools in setup.py so dependencies are detected
++
++---
++ setup.py | 3 +--
++ 1 file changed, 1 insertion(+), 2 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index 9cd515a..2c27d58 100755
++--- a/setup.py
+++++ b/setup.py
++@@ -129,8 +129,7 @@ setup_args['cmdclass'] = {
++ # Handle scripts, dependencies, and setuptools specific things
++ #---------------------------------------------------------------------------
++ 
++-if any(arg.startswith('bdist') for arg in sys.argv):
++-    import setuptools
+++import setuptools
++ 
++ # This dict is used for passing extra arguments that are setuptools
++ # specific to setup
diff --cc debian/patches/series
index b18cab1,0000000..c18d4c9
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +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

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