[Python-modules-commits] r28819 - in packages/python-pip/trunk/debian (4 files)

[barry at users.alioth.debian.org]

    Date: Friday, May 9, 2014 @ 21:45:16
  Author: barry
Revision: 28819

* New upstream release.
* d/patches/de-vendorize.patch: Refreshed.

Modified:
  packages/python-pip/trunk/debian/changelog
  packages/python-pip/trunk/debian/patches/de-vendorize.patch
  packages/python-pip/trunk/debian/patches/use-venv-wheels.patch
  packages/python-pip/trunk/debian/rules

Modified: packages/python-pip/trunk/debian/changelog
===================================================================
--- packages/python-pip/trunk/debian/changelog	2014-05-09 21:26:15 UTC (rev 28818)
+++ packages/python-pip/trunk/debian/changelog	2014-05-09 21:45:16 UTC (rev 28819)
@@ -1,6 +1,8 @@
-python-pip (1.5.4-2) UNRELEASED; urgency=medium
+python-pip (1.5.5-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release.
+  * d/patches/de-vendorize.patch: Refreshed.
   * d/patches/use-venv-wheels.patch:
     - When inside a virtual environment, add to sys.path any wheels found
       in <venv>/usr/share/python-wheels
@@ -24,7 +26,7 @@
   * d/python3-pip.manpages: Updated.
   * d/python3-pip.pyremove: Removed.
 
- -- Barry Warsaw <barry at debian.org>  Fri, 09 May 2014 14:44:32 -0400
+ -- Barry Warsaw <barry at debian.org>  Fri, 09 May 2014 17:27:08 -0400
 
 python-pip (1.5.4-1) unstable; urgency=medium
 

Modified: packages/python-pip/trunk/debian/patches/de-vendorize.patch
===================================================================
--- packages/python-pip/trunk/debian/patches/de-vendorize.patch	2014-05-09 21:26:15 UTC (rev 28818)
+++ packages/python-pip/trunk/debian/patches/de-vendorize.patch	2014-05-09 21:45:16 UTC (rev 28819)
@@ -144,7 +144,7 @@
            'pip%s=pip:main' % sys.version[:3]]),
 --- a/pip.egg-info/SOURCES.txt
 +++ b/pip.egg-info/SOURCES.txt
-@@ -49,186 +49,6 @@
+@@ -49,188 +49,6 @@
  pip.egg-info/not-zip-safe
  pip.egg-info/requires.txt
  pip.egg-info/top_level.txt
@@ -201,6 +201,8 @@
 -pip/_vendor/html5lib/filters/whitespace.py
 -pip/_vendor/html5lib/serializer/__init__.py
 -pip/_vendor/html5lib/serializer/htmlserializer.py
+-pip/_vendor/html5lib/treeadapters/__init__.py
+-pip/_vendor/html5lib/treeadapters/sax.py
 -pip/_vendor/html5lib/treebuilders/__init__.py
 -pip/_vendor/html5lib/treebuilders/_base.py
 -pip/_vendor/html5lib/treebuilders/dom.py
@@ -331,7 +333,7 @@
  pip/backwardcompat/__init__.py
  pip/commands/__init__.py
  pip/commands/bundle.py
-@@ -247,4 +67,4 @@
+@@ -249,4 +67,4 @@
  pip/vcs/bazaar.py
  pip/vcs/git.py
  pip/vcs/mercurial.py

Modified: packages/python-pip/trunk/debian/patches/use-venv-wheels.patch
===================================================================
--- packages/python-pip/trunk/debian/patches/use-venv-wheels.patch	2014-05-09 21:26:15 UTC (rev 28818)
+++ packages/python-pip/trunk/debian/patches/use-venv-wheels.patch	2014-05-09 21:45:16 UTC (rev 28819)
@@ -7,7 +7,7 @@
 
 --- a/pip/__init__.py
 +++ b/pip/__init__.py
-@@ -171,6 +171,24 @@
+@@ -171,6 +171,25 @@
      if initial_args is None:
          initial_args = sys.argv[1:]
  
@@ -15,7 +15,8 @@
 +    # environment, we have to add all the devendorized wheels to sys.path from
 +    # inside the venv, otherwise the devendorized packages won't be found.
 +    # Only do this in a venv so it doesn't affect global pip operation.
-+    if sys.prefix != sys.base_prefix:
++    # Python 2 does not have a sys.base_prefix attribute.
++    if sys.prefix != getattr(sys, 'base_prefix', sys.prefix):
 +        wheel_dir = os.path.join(
 +            sys.base_prefix, 'usr', 'share', 'python-wheels')
 +        # We'll just add all the wheels we find.  When pyvenv initializes the

Modified: packages/python-pip/trunk/debian/rules
===================================================================
--- packages/python-pip/trunk/debian/rules	2014-05-09 21:26:15 UTC (rev 28818)
+++ packages/python-pip/trunk/debian/rules	2014-05-09 21:45:16 UTC (rev 28819)
@@ -14,7 +14,7 @@
 	dh_python3
 	rm -f debian/python3-pip/usr/bin/pip
 	rm -f debian/python3-pip/usr/bin/pip3.?
-	rm -rf debian/python3-pip/usr/lib/python3*/dist-packages/pip-*.egg-info
+	rm -rf debian/python3-pip/usr/lib/python3.?
 
 override_dh_python2:
 	dh_python2