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

commit 933a9b6f4ca0f370c3681d89ee23d80818d76c89
Merge: 8574214 c3aabda
Author: Gordon Ball <gordon at chronitis.net>
Date:   Sun Dec 4 12:15:55 2016 +0100

    merge patched into master

 debian/.git-dpm                                                  | 6 +++---
 ...01-Use-setuptools-for-everything-so-the-python-Depends-.patch | 2 +-
 ...02-Fix-ENV_CONFIG_PATH-for-Debian-systems-we-never-use-.patch | 2 +-
 docs/changelog.rst                                               | 9 +++++++++
 docs/index.rst                                                   | 2 +-
 jupyter_core/command.py                                          | 6 +++---
 jupyter_core/troubleshoot.py                                     | 2 +-
 jupyter_core/version.py                                          | 2 +-
 8 files changed, 20 insertions(+), 11 deletions(-)

diff --cc debian/.git-dpm
index 1ee409f,0000000..57994e7
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
- 4dc7c94cb5b9aa25c5ae150d8850df5a6dbd0fa9
- 4dc7c94cb5b9aa25c5ae150d8850df5a6dbd0fa9
- 719a46e5de8fef682432bbe073decca0e21d267d
++c3aabdaf041ece42543d779c76fda631972733f6
++c3aabdaf041ece42543d779c76fda631972733f6
++5ca812cce6e66ca755f64c6f00912004fe24d711
 +5ca812cce6e66ca755f64c6f00912004fe24d711
 +jupyter-core_4.2.1.orig.tar.gz
 +843b92a4293f07a7cee6ce9240d9906e708c4ce3
 +58107
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Use-setuptools-for-everything-so-the-python-Depends-.patch
index 9f67a47,0000000..65228c1
mode 100644,000000..100644
--- a/debian/patches/0001-Use-setuptools-for-everything-so-the-python-Depends-.patch
+++ b/debian/patches/0001-Use-setuptools-for-everything-so-the-python-Depends-.patch
@@@ -1,25 -1,0 +1,25 @@@
- From 87e21180455dc0f3cc98ceac9c4fea76ee8906bc Mon Sep 17 00:00:00 2001
++From f7854e09ef5ec44531d19d374e139cc57086ad5f Mon Sep 17 00:00:00 2001
 +From: Julien Puydt <julien.puydt at laposte.net>
 +Date: Tue, 6 Oct 2015 07:21:43 +0200
 +Subject: Use setuptools for everything (so the python*:Depends substitutions
 + work)
 +
 +Forwarded: no
 +---
 + setup.py | 3 +--
 + 1 file changed, 1 insertion(+), 2 deletions(-)
 +
 +diff --git a/setup.py b/setup.py
 +index f041234..a0c89f3 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -74,8 +74,7 @@ setup_args = dict(
 +     ],
 + )
 + 
 +-if any(arg.startswith('bdist') for arg in sys.argv):
 +-    import setuptools
 ++import setuptools
 + 
 + setuptools_args = {}
 + 
diff --cc debian/patches/0002-Fix-ENV_CONFIG_PATH-for-Debian-systems-we-never-use-.patch
index 162af8e,0000000..23565fd
mode 100644,000000..100644
--- a/debian/patches/0002-Fix-ENV_CONFIG_PATH-for-Debian-systems-we-never-use-.patch
+++ b/debian/patches/0002-Fix-ENV_CONFIG_PATH-for-Debian-systems-we-never-use-.patch
@@@ -1,22 -1,0 +1,22 @@@
- From 4dc7c94cb5b9aa25c5ae150d8850df5a6dbd0fa9 Mon Sep 17 00:00:00 2001
++From c3aabdaf041ece42543d779c76fda631972733f6 Mon Sep 17 00:00:00 2001
 +From: Ximin Luo <infinity0 at debian.org>
 +Date: Sat, 3 Dec 2016 15:21:44 +0100
 +Subject: Fix ENV_CONFIG_PATH for Debian systems, we never use /usr/etc
 +
 +---
 + jupyter_core/paths.py | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/jupyter_core/paths.py b/jupyter_core/paths.py
 +index 57ef58f..d6a4c5c 100644
 +--- a/jupyter_core/paths.py
 ++++ b/jupyter_core/paths.py
 +@@ -158,7 +158,7 @@ else:
 +         "/etc/jupyter",
 +     ]
 + 
 +-ENV_CONFIG_PATH = [os.path.join(sys.prefix, 'etc', 'jupyter')]
 ++ENV_CONFIG_PATH = [os.path.join('/etc', 'jupyter')]
 + 
 + 
 + def jupyter_config_path():

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