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

[stefanor at users.alioth.debian.org]

    Date: Monday, November 17, 2014 @ 06:59:33
  Author: stefanor
Revision: 31460

* Team upload.
* Remove d/patches/format_egg_string.patch. This was worked around,
  upstream, in 1.0. And this patch now breaks pip uninstall in virtualenvs.
  (Closes: #751827)

Modified:
  packages/python-pip/trunk/debian/changelog
  packages/python-pip/trunk/debian/patches/series
Deleted:
  packages/python-pip/trunk/debian/patches/format_egg_string.patch

Modified: packages/python-pip/trunk/debian/changelog
===================================================================
--- packages/python-pip/trunk/debian/changelog	2014-11-17 04:36:14 UTC (rev 31459)
+++ packages/python-pip/trunk/debian/changelog	2014-11-17 06:59:33 UTC (rev 31460)
@@ -1,3 +1,12 @@
+python-pip (1.5.6-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Remove d/patches/format_egg_string.patch. This was worked around,
+    upstream, in 1.0. And this patch now breaks pip uninstall in virtualenvs.
+    (Closes: #751827)
+
+ -- Stefano Rivera <stefanor at debian.org>  Sun, 16 Nov 2014 22:21:35 -0800
+
 python-pip (1.5.6-2) unstable; urgency=medium
 
   * Team upload.

Deleted: packages/python-pip/trunk/debian/patches/format_egg_string.patch
===================================================================
--- packages/python-pip/trunk/debian/patches/format_egg_string.patch	2014-11-17 04:36:14 UTC (rev 31459)
+++ packages/python-pip/trunk/debian/patches/format_egg_string.patch	2014-11-17 06:59:33 UTC (rev 31460)
@@ -1,15 +0,0 @@
-Description: use the same .egg string format than Debian python-setuptools
-Author: Carl Chenet <chaica at ohmytux.com>
-Bug-Debian: http://bugs.debian.org/562544
-
---- a/pip/req.py
-+++ b/pip/req.py
-@@ -508,7 +508,7 @@
-         paths_to_remove = UninstallPathSet(dist)
- 
-         pip_egg_info_path = os.path.join(dist.location,
--                                         dist.egg_name()) + '.egg-info'
-+                                dist.egg_name().split('-py')[0]) + '.egg-info'
-         dist_info_path = os.path.join(dist.location,
-                                       '-'.join(dist.egg_name().split('-')[:2])
-                                       ) + '.dist-info'

Modified: packages/python-pip/trunk/debian/patches/series
===================================================================
--- packages/python-pip/trunk/debian/patches/series	2014-11-17 04:36:14 UTC (rev 31459)
+++ packages/python-pip/trunk/debian/patches/series	2014-11-17 06:59:33 UTC (rev 31460)
@@ -1,4 +1,3 @@
-format_egg_string.patch
 de-vendorize.patch
 use-venv-wheels.patch
 better-error-message.patch