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

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

    Date: Wednesday, December 12, 2012 @ 20:32:43
  Author: warsaw-guest
Revision: 23159

* Team upload.
* debian/patches/multiarch.patch: Use system multiarch path if available.
  (Closes: #695707)

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-12 18:47:40 UTC (rev 23158)
+++ packages/python-virtualenv/trunk/debian/changelog	2012-12-12 20:32:43 UTC (rev 23159)
@@ -1,3 +1,11 @@
+python-virtualenv (1.8.4-2) experimental; urgency=low
+
+  * Team upload.
+  * debian/patches/multiarch.patch: Use system multiarch path if available.
+    (Closes: #695707)
+
+ -- Barry Warsaw <barry at python.org>  Wed, 12 Dec 2012 14:10:49 -0500
+
 python-virtualenv (1.8.4-1) experimental; urgency=low
 
   * Team upload.

Modified: packages/python-virtualenv/trunk/debian/control
===================================================================
--- packages/python-virtualenv/trunk/debian/control	2012-12-12 18:47:40 UTC (rev 23158)
+++ packages/python-virtualenv/trunk/debian/control	2012-12-12 20:32:43 UTC (rev 23159)
@@ -19,6 +19,7 @@
 Depends:
  python-pkg-resources,
  python-setuptools,
+ 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-12 20:32:43 UTC (rev 23159)
@@ -0,0 +1,44 @@
+Description: Use system multiarch path if available.
+Author: Barry Warsaw <barry at python.org>
+Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695707
+Forwarded: no
+
+--- a/virtualenv_embedded/site.py
++++ b/virtualenv_embedded/site.py
+@@ -83,6 +83,22 @@
+ USER_SITE = None
+ USER_BASE = None
+ 
++# Debian multiarch support.
++# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695707
++# We can't use subprocess here. :/
++host_architectures = []
++for command in ['dpkg-architecture -qDEB_HOST_MULTIARCH',
++                'gcc -print-multiarch',
++                ]:
++    try:
++        with os.popen(command) as fp:
++            host_arch = fp.read().splitlines()[0]
++            if host_arch not in host_architectures:
++                host_architectures.append(host_arch)
++    except IndexError:
++        pass
++host_architectures.append('plat-%s' % sys.platform)
++
+ _is_pypy = hasattr(sys, 'pypy_version_info')
+ _is_jython = sys.platform[:4] == 'java'
+ if _is_jython:
+@@ -570,9 +586,10 @@
+         #
+         # This is hardcoded in the Python executable, but relative to sys.prefix:
+         for path in paths[:]:
+-            plat_path = os.path.join(path, 'plat-%s' % sys.platform)
+-            if os.path.exists(plat_path):
+-                paths.append(plat_path)
++            for host_arch in host_architectures:
++                plat_path = os.path.join(path, host_arch)
++                if os.path.exists(plat_path):
++                    paths.append(plat_path)
+     elif sys.platform == 'win32':
+         paths = [os.path.join(sys.real_prefix, 'Lib'), os.path.join(sys.real_prefix, 'DLLs')]
+     else:

Modified: packages/python-virtualenv/trunk/debian/patches/series
===================================================================
--- packages/python-virtualenv/trunk/debian/patches/series	2012-12-12 18:47:40 UTC (rev 23158)
+++ packages/python-virtualenv/trunk/debian/patches/series	2012-12-12 20:32:43 UTC (rev 23159)
@@ -2,3 +2,4 @@
 use_distribute.patch
 system-python.patch
 entry-points.patch
+multiarch.patch