[Python-modules-commits] [python-pip] 01/01: Fix FTBFS with #814292. Also #821014.

[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 c99f18a5f069a215ca41a5289bef0306611809ac
Author: Barry Warsaw <barry at python.org>
Date:   Thu Apr 14 14:55:31 2016 -0400

    Fix FTBFS with #814292. Also #821014.
    
    * d/control: Add python{,3}-setuptools to Recommends.  (Closes: #814292)
    * d/rules: We no longer need to dirtbike _markerlib.  (Closes: #821014)
---
 debian/changelog | 7 +++++++
 debian/control   | 2 ++
 debian/rules     | 1 -
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 96ca97d..bdd335d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python-pip (8.1.1-2) UNRELEASED; urgency=medium
+
+  * d/control: Add python{,3}-setuptools to Recommends.  (Closes: #814292)
+  * d/rules: We no longer need to dirtbike _markerlib.  (Closes: #821014)
+
+ -- Barry Warsaw <barry at debian.org>  Thu, 14 Apr 2016 10:27:15 -0400
+
 python-pip (8.1.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 5bf8a3d..cb09c82 100644
--- a/debian/control
+++ b/debian/control
@@ -46,6 +46,7 @@ Depends: ca-certificates,
          ${python:Depends},
 Recommends: build-essential,
             python-all-dev (>= 2.6),
+            python-setuptools,
             python-wheel,
 Description: alternative Python package installer
  pip is a replacement for easy_install, and is intended to be an improved
@@ -61,6 +62,7 @@ Depends: ca-certificates,
          ${python3:Depends},
 Recommends: build-essential,
             python3-dev (>= 3.2),
+            python3-setuptools,
             python3-wheel,
 Description: alternative Python package installer - Python 3 version of the package
  pip is a replacement for easy_install, and is intended to be an improved
diff --git a/debian/rules b/debian/rules
index 44d525e..2dd241e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,7 +42,6 @@ override_dh_python2:
 override_dh_auto_install:
 	dh_auto_install
 	mkdir -p $(CURDIR)/debian/python-pip-whl/usr/share/python-wheels
-	dirtbike _markerlib
 	dirtbike CacheControl
 	dirtbike chardet
 	dirtbike colorama

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