[Python-modules-commits] [python-pip] 04/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 1890a4eae9d26e9c219ce5ee81b297be03e363a1
Merge: 4ed3bc8 0ddf5c2
Author: Barry Warsaw <barry at python.org>
Date:   Mon Jan 25 16:58:47 2016 -0500

    merge patched-dirtbike into dirtbike

 debian/.git-dpm                                    |  4 ++--
 .../0005-Revert-to-old-wheels-directory.patch      | 22 ---------------------
 debian/patches/fix-wheel-dir.patch                 | 23 ----------------------
 debian/patches/series                              |  2 --
 4 files changed, 2 insertions(+), 49 deletions(-)

diff --cc debian/.git-dpm
index 15f3d24,0000000..ffbbed4
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
- eb83ea77ba6d080110626f11c4c5a1550a96d2f1
- eb83ea77ba6d080110626f11c4c5a1550a96d2f1
++0ddf5c266e00c9cd5b02f0ae31939f5200c57e6d
++0ddf5c266e00c9cd5b02f0ae31939f5200c57e6d
 +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/series
index 4024ed0,0000000..ebeddd0
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,0 +1,3 @@@
 +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