[Python-modules-commits] [python-pip] 03/04: 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 e308dda63f4888b737e516ab8bf325a992e7bf82
Merge: 75e6b87 85022cf
Author: Barry Warsaw <barry at python.org>
Date:   Mon Nov 21 13:28:20 2016 -0500

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../patches/html5lib-alternative-beta-name.patch   | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 pip/_vendor/vendor.txt                             |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index c1a1d62,0000000..609e3c3
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
- 278b3faec873b18333dba315ddbe97754d71c858
- 278b3faec873b18333dba315ddbe97754d71c858
++85022cfea1a8788973a79a87c8641c6470ed3441
++85022cfea1a8788973a79a87c8641c6470ed3441
 +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/html5lib-alternative-beta-name.patch
index 0000000,0000000..85a9bd5
new file mode 100644
--- /dev/null
+++ b/debian/patches/html5lib-alternative-beta-name.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 85022cfea1a8788973a79a87c8641c6470ed3441 Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at python.org>
++Date: Mon, 21 Nov 2016 13:27:41 -0500
++Subject: Use alternative html5lib beta version number.
++
++This matches what's in the Debian archive.
++
++Patch-Name: html5lib-alternative-beta-name.patch
++---
++ pip/_vendor/vendor.txt | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/pip/_vendor/vendor.txt b/pip/_vendor/vendor.txt
++index c2917c2..0871ef6 100644
++--- a/pip/_vendor/vendor.txt
+++++ b/pip/_vendor/vendor.txt
++@@ -1,5 +1,5 @@
++ distlib==0.2.3
++-html5lib==1.0b8
+++html5lib==0.999999999-1
++ six==1.10.0
++ colorama==0.3.7
++ requests==2.10.0
diff --cc debian/patches/series
index 0e92140,0000000..626ed90
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,0 +1,8 @@@
 +hands-off-system-packages.patch
 +debundle.patch
 +handle-unbundled-requests.patch
 +set_user_default.patch
 +skip-bad-requirements.patch
 +ignore-socks-warnings.patch
 +disable-pip-version-check.patch
++html5lib-alternative-beta-name.patch

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