[Python-modules-commits] [ipykernel] 03/15: merge patched into master

[Julien Cristau]

This is an automated email from the git hooks/post-receive script.

jcristau pushed a commit to branch master
in repository ipykernel.

commit bed1b90e5fb77978b2ff3f5cda819d78122d21d1
Merge: 3ff66ca c33d82b
Author: David Douard <david.douard at logilab.fr>
Date:   Fri Apr 8 14:02:53 2016 +0200

    merge patched into master

 debian/.git-dpm                                                     | 6 +++---
 .../0001-use-setuptools-for-everything-so-python-Depends-subs.patch | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 3b6ede2,0000000..d6b200c
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
- 9f3dea567a54974df6186dd31173aeb41b4d1057
- 9f3dea567a54974df6186dd31173aeb41b4d1057
- a505d800a11f430e7898abf32cc25ae84b0771b3
++c33d82b7ee43556a0e67a44ae1c5c94d9eb5a421
++c33d82b7ee43556a0e67a44ae1c5c94d9eb5a421
++3322506537ef59acca04053fe9088b26c4f633cf
 +3322506537ef59acca04053fe9088b26c4f633cf
 +ipykernel_4.2.2.orig.tar.gz
 +968c9f9271543a8036f27d4e69f10d2805105d34
 +80780
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-use-setuptools-for-everything-so-python-Depends-subs.patch
index 58f5f17,0000000..0299bc2
mode 100644,000000..100644
--- a/debian/patches/0001-use-setuptools-for-everything-so-python-Depends-subs.patch
+++ b/debian/patches/0001-use-setuptools-for-everything-so-python-Depends-subs.patch
@@@ -1,24 -1,0 +1,24 @@@
- From 9f3dea567a54974df6186dd31173aeb41b4d1057 Mon Sep 17 00:00:00 2001
++From c33d82b7ee43556a0e67a44ae1c5c94d9eb5a421 Mon Sep 17 00:00:00 2001
 +From: Julien Puydt <julien.puydt at laposte.net>
 +Date: Tue, 6 Oct 2015 07:58:09 +0200
 +Subject: use setuptools for everything so 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 3162744..924fd48 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -75,8 +75,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'] = [

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