[Python-modules-commits] [jupyter-console] 05/07: 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-console.

commit 641c13cf145d306f72bda14bf14dbbf45f191278
Merge: 07c85b4 23dd3f9
Author: Gordon Ball <gordon at chronitis.net>
Date:   Tue Nov 1 15:42:53 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...ally-use-setuptools-so-that-dependencies-.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  3 +--
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index efbce37,0000000..70cbc2f
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 08236a52dc46cccef83726b75e0033b5938be29f
- 08236a52dc46cccef83726b75e0033b5938be29f
++23dd3f9b13ce1ea8d6fbf2dd924b786768e0bc40
++23dd3f9b13ce1ea8d6fbf2dd924b786768e0bc40
 +08236a52dc46cccef83726b75e0033b5938be29f
 +08236a52dc46cccef83726b75e0033b5938be29f
 +jupyter-console_5.0.0.orig.tar.gz
 +03130aadbcc0b127d117d1a552c79bc0cd13ae72
 +26119
diff --cc debian/patches/0001-Unconditionally-use-setuptools-so-that-dependencies-.patch
index 0000000,0000000..2418007
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Unconditionally-use-setuptools-so-that-dependencies-.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 23dd3f9b13ce1ea8d6fbf2dd924b786768e0bc40 Mon Sep 17 00:00:00 2001
++From: Gordon Ball <gordon at chronitis.net>
++Date: Tue, 1 Nov 2016 15:42:31 +0100
++Subject: Unconditionally use setuptools so that dependencies are detected
++
++---
++ setup.py | 3 +--
++ 1 file changed, 1 insertion(+), 2 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index 1f9a604..27ce8a9 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -71,8 +71,7 @@ setup_args = dict(
++     ],
++ )
++ 
++-if 'develop' in sys.argv or any(a.startswith('bdist') for a in sys.argv):
++-    import setuptools
+++import setuptools
++ 
++ setuptools_args = {}
++ install_requires = setuptools_args['install_requires'] = [
diff --cc debian/patches/series
index 0000000,0000000..f4d6f74
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Unconditionally-use-setuptools-so-that-dependencies-.patch

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