[Python-modules-commits] [python-pip] 01/01: Knock down some TODOs

[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 46a50a13ae25e41b65a4e8f454f548ce2d35de2e
Author: Barry Warsaw <barry at python.org>
Date:   Fri Jan 29 11:40:05 2016 -0500

    Knock down some TODOs
    
    * wrap-and-sort -at
    * Trim some unnecessary B-Ds
    * Add Built-Using
    * Clean up the usr/lib/python3.* directory
---
 debian/changelog |  5 -----
 debian/control   | 37 ++++++++++++++++++++++---------------
 debian/rules     |  1 +
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c886349..d02e665 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,8 @@
 python-pip (7.1.2-1) UNRELEASED; urgency=medium
 
   * DO NOT RELEASE.  TODO:
-    - File ITP and get progress 1.2 into Debian, or port to progressbar
-      which is already in Debian.
-    - Build python-ipaddress-whl or rewheel it package.
-    - File ITP and upload 15.2 into Debian
     - Update Debian Python policy to name the new dependencies, all of
       which must be installed as -whl.  -- or rewheel
-    - Built-Using
   * New upstream release.
   * d/control:
     - Update python-pip-whl binary package's Depends since we will be
diff --git a/debian/control b/debian/control
index 7e31c4e..c7f3d5e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Barry Warsaw <barry at debian.org>,
            Carl Chenet <chaica at debian.org>,
-           Jeff Licquia <licquia at debian.org>
+           Jeff Licquia <licquia at debian.org>,
 Homepage: https://pip.pypa.io/en/stable/
 Build-Depends: debhelper (>= 8),
                dh-python,
@@ -12,15 +12,7 @@ Build-Depends: debhelper (>= 8),
                python-all (>= 2.6),
                python-docutils,
                python-ipaddress,
-               python-lockfile,
-               python-mock,
-               python-packaging,
-               python-progress,
-               python-pytest,
-               python-retrying,
-               python-scripttest,
                python-setuptools,
-               python-virtualenv,
                python3-all,
                python3-cachecontrol,
                python3-chardet,
@@ -39,7 +31,7 @@ Build-Depends: debhelper (>= 8),
                python3-setuptools,
                python3-six,
                python3-urllib3,
-               python3-wheel
+               python3-wheel,
 Standards-Version: 3.9.6
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.2
@@ -51,10 +43,25 @@ Architecture: all
 Depends: ca-certificates,
          python-pip-whl,
          ${misc:Depends},
-         ${python:Depends}
+         ${python:Depends},
 Recommends: build-essential,
             python-dev-all (>= 2.6),
-            python-wheel
+            python-wheel,
+Built-Using: python-ipaddress,
+             python3-cachecontrol,
+             python3-chardet,
+             python3-colorama,
+             python3-distlib,
+             python3-html5lib,
+             python3-lockfile,
+             python3-packaging,
+             python3-pkg-resources,
+             python3-progress,
+             python3-requests,
+             python3-retrying,
+             python3-setuptools,
+             python3-six,
+             python3-urllib3,
 Description: alternative Python package installer
  pip is a replacement for easy_install, and is intended to be an improved
  Python package installer.  It integrates with virtualenv, doesn't do partial
@@ -66,10 +73,10 @@ Architecture: all
 Depends: ca-certificates,
          python-pip-whl,
          ${misc:Depends},
-         ${python3:Depends}
+         ${python3:Depends},
 Recommends: build-essential,
             python3-dev (>= 3.2),
-            python3-wheel
+            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
  Python package installer.  It integrates with virtualenv, doesn't do partial
@@ -80,7 +87,7 @@ Description: alternative Python package installer - Python 3 version of the pack
 
 Package: python-pip-whl
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends},
 Description: alternative Python package installer
  pip is a replacement for easy_install, and is intended to be an improved
  Python package installer.  It integrates with virtualenv, doesn't do partial
diff --git a/debian/rules b/debian/rules
index d5193e6..3da5ded 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,7 @@ override_dh_python3:
 		debian/python3-pip/usr/bin/pip3
 	rm -f debian/python3-pip/usr/bin/pip
 	rm -f debian/python3-pip/usr/bin/pip3.*
+	rm -rf debian/python3-pip/usr/lib/python3.*
 
 override_dh_python2:
 	dh_python2

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