[Python-modules-commits] [ipython4] 04/10: Initialize git-dpm

[Julien Cristau]

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

jcristau pushed a commit to branch master
in repository ipython4.

commit 19d1fd98d869b39f875bce9f08e57800a47a3972
Merge: 5fa0306 5d56dbb
Author: Julien Cristau <julien.cristau at logilab.fr>
Date:   Fri Apr 8 12:49:16 2016 +0200

    Initialize git-dpm

 debian/.git-dpm                                    |  8 +++++++
 ...ols-also-for-the-install-target-so-the-py.patch | 25 ++++++++++++++++++++++
 debian/patches/series                              |  2 +-
 debian/patches/use_setuptools_for_install          | 16 --------------
 setup.py                                           |  3 +--
 5 files changed, 35 insertions(+), 19 deletions(-)

diff --cc debian/.git-dpm
index 0000000,0000000..9254a48
new file mode 100644
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,0 -1,0 +1,8 @@@
++# see git-dpm(1) from git-dpm package
++5d56dbb68f77a074f304bd4ff3a18961c7740994
++5d56dbb68f77a074f304bd4ff3a18961c7740994
++db354d7e8a8f01ad1689c09c5c4c085c712425d9
++db354d7e8a8f01ad1689c09c5c4c085c712425d9
++ipython_4.0.2.orig.tar.gz
++b44970b8a4d790f65d99d04ce7061fc81e903e6d
++6206506
diff --cc debian/patches/0001-use-setuptools-also-for-the-install-target-so-the-py.patch
index 0000000,0000000..e6ddf32
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-use-setuptools-also-for-the-install-target-so-the-py.patch
@@@ -1,0 -1,0 +1,25 @@@
++From 5d56dbb68f77a074f304bd4ff3a18961c7740994 Mon Sep 17 00:00:00 2001
++From: Julien Puydt <Julien Puydt>
++Date: Fri, 8 Apr 2016 12:49:16 +0200
++Subject: use setuptools also for the install target 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 0662a7f..45fc2f9 100755
++--- a/setup.py
+++++ b/setup.py
++@@ -170,8 +170,7 @@ needs_setuptools = set(('develop', 'release', 'bdist_egg', 'bdist_rpm',
++            'egg_info', 'easy_install', 'upload', 'install_egg_info',
++             ))
++ 
++-if len(needs_setuptools.intersection(sys.argv)) > 0:
++-    import setuptools
+++import setuptools
++ 
++ # This dict is used for passing extra arguments that are setuptools
++ # specific to setup
diff --cc debian/patches/series
index 9a7533a,0000000..f204021
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,1 @@@
- use_setuptools_for_install
++0001-use-setuptools-also-for-the-install-target-so-the-py.patch

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