[Python-modules-commits] [python-pip] 06/17: 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 d6f1708436921d115988f35b36b404d4fce58866
Merge: 0806028 0ebc20d
Author: Barry Warsaw <barry at python.org>
Date:   Fri Jun 17 09:50:44 2016 +0300

    merge patched into master

 debian/.git-dpm                |  4 ++--
 debian/patches/0006-Undo.patch | 28 ----------------------------
 debian/patches/series          |  1 -
 pip/__main__.py                |  9 +++++++++
 4 files changed, 11 insertions(+), 31 deletions(-)

diff --cc debian/.git-dpm
index 33faf30,0000000..4264eb4
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
- 62e0b83e0a084d0aae4aea3aecec4bdfc89bc1b8
- 62e0b83e0a084d0aae4aea3aecec4bdfc89bc1b8
++0ebc20dd1c0e5f2c7c1f28b0859a63f8b024365c
++0ebc20dd1c0e5f2c7c1f28b0859a63f8b024365c
 +030df74bb06ecef9a308cb8315a0c93f1f971cfb
 +030df74bb06ecef9a308cb8315a0c93f1f971cfb
 +python-pip_8.1.2.orig.tar.gz
 +1c13c247967ec5bee6de5fd104c5d78ba30951c7
 +1140573
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/series
index 5e92cc7,0000000..208e71a
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,0 +1,5 @@@
 +hands-off-system-packages.patch
 +debundle.patch
 +handle-unbundled-requests.patch
 +set_user_default.patch
 +skip-bad-requirements.patch
- 0006-Undo.patch

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