[Python-modules-commits] [python-pip] 11/16: merge patched into master

[Barry Warsaw]

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

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

commit a7c72c5482a11bccf216df65087638fa40cac440
Merge: ac1d933 bf86069
Author: Barry Warsaw <barry at python.org>
Date:   Fri Jan 29 15:14:18 2016 -0500

    merge patched into master

 debian/.git-dpm                                            | 4 ++--
 debian/patches/{enable-debundling.patch => debundle.patch} | 6 +++---
 debian/patches/series                                      | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index f8154e0,0000000..7d90b0c
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
- de57da1c3ff699d9b039ab1ec3ad246e7e3253a1
- de57da1c3ff699d9b039ab1ec3ad246e7e3253a1
++bf860692b3d9c96ffa0cd1eb24dee042eae2f1f3
++bf860692b3d9c96ffa0cd1eb24dee042eae2f1f3
 +c9fd1b7c41802c64663a7a4646bf9b546f2389e2
 +c9fd1b7c41802c64663a7a4646bf9b546f2389e2
 +python-pip_8.0.2.orig.tar.gz
 +974a8c345d272b9d9072287f399aab8410067f7e
 +1130183
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/debundle.patch
index 42ab793,0000000..f16d200
mode 100644,000000..100644
--- a/debian/patches/debundle.patch
+++ b/debian/patches/debundle.patch
@@@ -1,30 -1,0 +1,30 @@@
- From de57da1c3ff699d9b039ab1ec3ad246e7e3253a1 Mon Sep 17 00:00:00 2001
++From bf860692b3d9c96ffa0cd1eb24dee042eae2f1f3 Mon Sep 17 00:00:00 2001
 +From: Barry Warsaw <barry at python.org>
 +Date: Thu, 3 Dec 2015 17:24:13 -0500
- Subject: Tell pip to alias the bundled packages.
++Subject: Devendorize wheels and use system built wheels.
 +
- Patch-Name: enable-debundling.patch
++Patch-Name: debundle.patch
 +---
 + pip/_vendor/__init__.py | 4 ++--
 + 1 file changed, 2 insertions(+), 2 deletions(-)
 +
 +diff --git a/pip/_vendor/__init__.py b/pip/_vendor/__init__.py
 +index b09a7c3..1cb35a1 100644
 +--- a/pip/_vendor/__init__.py
 ++++ b/pip/_vendor/__init__.py
 +@@ -14,13 +14,13 @@ import sys
 + # Downstream redistributors which have debundled our dependencies should also
 + # patch this value to be true. This will trigger the additional patching
 + # to cause things like "six" to be available as pip.
 +-DEBUNDLED = False
 ++DEBUNDLED = True
 + 
 + # By default, look in this directory for a bunch of .whl files which we will
 + # add to the beginning of sys.path before attempting to import anything. This
 + # is done to support downstream re-distributors like Debian and Fedora who
 + # wish to create their own Wheels for our dependencies to aid in debundling.
 +-WHEEL_DIR = os.path.abspath(os.path.dirname(__file__))
 ++WHEEL_DIR = os.path.abspath(os.path.join(sys.prefix, 'share', 'python-wheels'))
 + 
 + 
 + # Define a small helper function to alias our vendored modules to the real ones
diff --cc debian/patches/series
index 2c4b0cf,0000000..6895543
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,2 @@@
 +hands-off-system-packages.patch
- enable-debundling.patch
++debundle.patch

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