[Python-modules-commits] [python-pip] 01/14: More updates for 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 d94eb7ca6a04296cd9adb71ad8ce2c1b19d40176
Author: Barry Warsaw <barry at python.org>
Date:   Mon Jan 25 16:49:04 2016 -0500

    More updates for dirtbike.
    
     * Update changelog
     * Fix Depends/wrap-and-sort
     * Reinstate python-pip-whl to avoid NEW
     * Update debian/rules
---
 debian/changelog                 | 12 +++---------
 debian/control                   | 22 ++++++++++++++++------
 debian/python-pip-common.install |  1 -
 debian/python-pip-whl.install    |  1 +
 debian/rules                     |  4 ++--
 5 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 11cb1c8..dfdcb1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,17 +11,11 @@ python-pip (7.1.2-1) UNRELEASED; urgency=medium
     - Pass `-m 'not network` to test suite
   * New upstream release.
   * d/control:
-    - Remove the python-pip-whl binary package since we will be rewheeling
-      packages at build-time into a private directory.
-    - Add the python-pip-common binary package which will contain the
-      rewheeled .whl files.
-    - Change Depends for python-pip and python3-pip to require
-      python-pip-common in all cases.  This fixes the problem where pip used
-      outside of a virtual environment can get broken by packages installed
-      into /usr/local.
+    - Update python-pip-whl binary package's Depends since we will be
+      rewheeling packages at build-time into a private directory.
     - Update Homepage.
     - Build-Depends: Add python-* and python3-* dependent packages for
-      rewheeling via dirtbike.
+      rewheeling via dirtbike.  Also add new upstream dependencies.
   * d/rules:
     - Use the upstream recommended way to devendorize.
     - Use dirtbike to rewheel the dependent packages.
diff --git a/debian/control b/debian/control
index d27339b..8a62d41 100644
--- a/debian/control
+++ b/debian/control
@@ -45,8 +45,13 @@ Vcs-Browser: http://anonscm.debian.org/cgit/python-modules/packages/python-pip.g
 
 Package: python-pip
 Architecture: all
-Depends: ca-certificates, ${misc:Depends}, ${python:Depends}
-Recommends: build-essential, python-dev-all (>= 2.6), python-wheel
+Depends: ca-certificates,
+         python-pip-whl,
+         ${misc:Depends},
+         ${python:Depends}
+Recommends: build-essential,
+            python-dev-all (>= 2.6),
+            python-wheel
 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
@@ -55,8 +60,13 @@ Description: alternative Python package installer
 
 Package: python3-pip
 Architecture: all
-Depends: ca-certificates, ${misc:Depends}, ${python3:Depends}
-Recommends: build-essential, python3-dev (>= 3.2), python3-wheel
+Depends: ca-certificates,
+         python-pip-whl,
+         ${misc:Depends},
+         ${python3:Depends}
+Recommends: build-essential,
+            python3-dev (>= 3.2),
+            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
@@ -65,7 +75,7 @@ Description: alternative Python package installer - Python 3 version of the pack
  .
  This is the Python 3 version of the package.
 
-Package: python-pip-common
+Package: python-pip-whl
 Architecture: all
 Depends: ${misc:Depends}
 Description: alternative Python package installer
@@ -74,4 +84,4 @@ Description: alternative Python package installer
  installs, can save package state for replaying, can install from non-egg
  sources, and can install from version control repositories.
  .
- This is the common support package for pip.
+ This package contains the wheel files pip dependent packages.
diff --git a/debian/python-pip-common.install b/debian/python-pip-common.install
deleted file mode 100644
index 1cf1c1b..0000000
--- a/debian/python-pip-common.install
+++ /dev/null
@@ -1 +0,0 @@
-dist/*.whl usr/share/python-pip-common/wheels
diff --git a/debian/python-pip-whl.install b/debian/python-pip-whl.install
new file mode 100644
index 0000000..ad074a0
--- /dev/null
+++ b/debian/python-pip-whl.install
@@ -0,0 +1 @@
+dist/*.whl usr/share/python-wheels
diff --git a/debian/rules b/debian/rules
index 2ff51f8..3714c7e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,12 +25,12 @@ override_dh_auto_build:
 	dirtbike html5lib
 	dirtbike lockfile
 	dirtbike packaging
+	dirtbike pkg_resources
 	dirtbike requests
 	dirtbike retrying
 	dirtbike setuptools
 	dirtbike six
 	dirtbike urllib3
-	mkdir -p debian/python-pip-common/usr/share/python-pip-common/wheels
 
 # Upstream does not bundle enough of the source tree in the tarball to run the
 # test suite.  https://github.com/pypa/pip/issues/3370
@@ -63,4 +63,4 @@ override_dh_installman:
 
 override_dh_clean:
 	dh_clean
-	rm -rf debian/tmp/usr/share/python-wheels
+	rm -rf debian/tmp

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