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

[warsaw-guest at users.alioth.debian.org]

    Date: Thursday, December 20, 2012 @ 16:44:58
  Author: warsaw-guest
Revision: 23193

debian/patches/multiarch.patch: Use system multiarch path.

Added:
  packages/python-virtualenv/trunk/debian/patches/multiarch.patch
Modified:
  packages/python-virtualenv/trunk/debian/changelog
  packages/python-virtualenv/trunk/debian/control
  packages/python-virtualenv/trunk/debian/patches/series

Modified: packages/python-virtualenv/trunk/debian/changelog
===================================================================
--- packages/python-virtualenv/trunk/debian/changelog	2012-12-20 16:28:20 UTC (rev 23192)
+++ packages/python-virtualenv/trunk/debian/changelog	2012-12-20 16:44:58 UTC (rev 23193)
@@ -1,9 +1,7 @@
 python-virtualenv (1.8.4-2) experimental; urgency=low
 
   * Team upload.
-  * debian/patches/multiarch.patch: Use system multiarch path if available.
-  * debian/control: Add Depends on "gcc | dpkg-dev" for commands to return
-    the host architecture.
+  * debian/patches/multiarch.patch: Use system multiarch path.
   * Closes: #695707
 
  -- Barry Warsaw <barry at python.org>  Wed, 12 Dec 2012 14:10:49 -0500

Modified: packages/python-virtualenv/trunk/debian/control
===================================================================
--- packages/python-virtualenv/trunk/debian/control	2012-12-20 16:28:20 UTC (rev 23192)
+++ packages/python-virtualenv/trunk/debian/control	2012-12-20 16:44:58 UTC (rev 23193)
@@ -19,7 +19,6 @@
 Depends:
  python-pkg-resources,
  python-setuptools,
- gcc | dpkg-dev,
  ${misc:Depends},
  ${python:Depends}
 Recommends: python-pip (>= 0.7.2)

Added: packages/python-virtualenv/trunk/debian/patches/multiarch.patch
===================================================================
--- packages/python-virtualenv/trunk/debian/patches/multiarch.patch	                        (rev 0)
+++ packages/python-virtualenv/trunk/debian/patches/multiarch.patch	2012-12-20 16:44:58 UTC (rev 23193)
@@ -0,0 +1,21 @@
+--- a/virtualenv_embedded/site.py
++++ b/virtualenv_embedded/site.py
+@@ -584,9 +584,15 @@
+                 paths.insert(0, lib64_path)
+             else:
+                 paths.append(lib64_path)
+-        # This is hardcoded in the Python executable, but relative to sys.prefix:
+-        plat_path = os.path.join(sys.real_prefix, 'lib', 'python'+sys.version[:3],
+-                                 'plat-%s' % sys.platform)
++        # This is hardcoded in the Python executable, but relative to
++        # sys.prefix.  Debian change: we need to add the multiarch triplet
++        # here, which is where the real stuff lives.  As per PEP 421, in
++        # Python 3.3+, this lives in sys.implementation, while in Python 2.7
++        # it lives in sys.
++        multiarch = getattr(sys, 'implementation', sys)._multiarch
++        plat_path = os.path.join(sys.real_prefix, 'lib', 
++                                 'python'+sys.version[:3],
++                                 'plat-%s' % multiarch)
+         if os.path.exists(plat_path):
+             paths.append(plat_path)
+     # This is hardcoded in the Python executable, but

Modified: packages/python-virtualenv/trunk/debian/patches/series
===================================================================
--- packages/python-virtualenv/trunk/debian/patches/series	2012-12-20 16:28:20 UTC (rev 23192)
+++ packages/python-virtualenv/trunk/debian/patches/series	2012-12-20 16:44:58 UTC (rev 23193)
@@ -2,3 +2,4 @@
 use_distribute.patch
 system-python.patch
 entry-points.patch
+multiarch.patch