[Python-modules-commits] [python-pip] 03/14: merge patched-dirtbike into dirtbike

[Barry Warsaw]

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

barry pushed a commit to branch dirtbike
in repository python-pip.

commit 4ed3bc89ab06c98185073862e864c024e482fa1b
Merge: d94eb7c eb83ea7
Author: Barry Warsaw <barry at python.org>
Date:   Mon Jan 25 16:51:56 2016 -0500

    merge patched-dirtbike into dirtbike

 debian/.git-dpm                                    |  4 ++--
 .../0005-Revert-to-old-wheels-directory.patch      | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 pip/__init__.py                                    |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index e72b8f9,0000000..15f3d24
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
- 0cfc43d1b6b2e70ae1553682a47e29986f626c89
- 0cfc43d1b6b2e70ae1553682a47e29986f626c89
++eb83ea77ba6d080110626f11c4c5a1550a96d2f1
++eb83ea77ba6d080110626f11c4c5a1550a96d2f1
 +3be157ea672de9d85e0e888ac4080ebe66fb4782
 +3be157ea672de9d85e0e888ac4080ebe66fb4782
 +python-pip_7.1.2.orig.tar.gz
 +9eb9ea19b630412bc2b2b587fc6bbbee71950a96
 +1049170
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0005-Revert-to-old-wheels-directory.patch
index 0000000,0000000..3efe897
new file mode 100644
--- /dev/null
+++ b/debian/patches/0005-Revert-to-old-wheels-directory.patch
@@@ -1,0 -1,0 +1,22 @@@
++From eb83ea77ba6d080110626f11c4c5a1550a96d2f1 Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at python.org>
++Date: Mon, 25 Jan 2016 16:51:42 -0500
++Subject: Revert to old wheels directory.
++
++---
++ pip/__init__.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/pip/__init__.py b/pip/__init__.py
++index b654adf..f48172b 100755
++--- a/pip/__init__.py
+++++ b/pip/__init__.py
++@@ -58,7 +58,7 @@ else:
++ if in_venv:
++     wheel_dir = os.path.join(sys.prefix, 'lib', 'python-wheels')
++ else:
++-    wheel_dir = '/usr/share/python-pip-common/wheels'
+++    wheel_dir = '/usr/share/python-wheels'
++ 
++ # We'll add all the wheels we find to the front of sys.path so that they're
++ # found first, even if the same dependencies are available in site-packages.
diff --cc debian/patches/series
index ce46624,0000000..4024ed0
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,5 @@@
 +use-wheels.patch
 +hands-off-system-packages.patch
 +enable-debundling.patch
 +fix-wheel-dir.patch
++0005-Revert-to-old-wheels-directory.patch

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