Merge branch 'remove-2.6-dev'

plugins/python-build/share/python-build/2.6-dev

@@ -1,5 +0,0 @@
-require_cc "gcc" "clang"
-install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
-install_hg "Python-2.6-dev" "https://bitbucket.org/mirror/cpython" "2.6" standard verify_py26
-install_package "setuptools-3.3" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.3.tar.gz#87680a0eb0bb6f720d5e2d89ba67debc" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python

plugins/python-build/share/python-build/patches/2.6-dev/Python-2.6-dev/000_patch-setup.py.diff

@@ -1,47 +0,0 @@
-
-# HG changeset patch
-# User Barry Warsaw <barry@python.org>
-# Date 1302190091 14400
-# Node ID bd0f73a9538e05f526feaf05821e68bdcff498fa
-# Parent  2e4cdaffe493e879fb5367a4aa454491de451137
-Backport for Python 2.7 of issue 11715 support for building Python on
-multiarch Debian/Ubuntu.
-
-diff --git a/setup.py b/setup.py
---- setup.py.orig
-+++ setup.py
-@@ -345,10 +345,33 @@ class PyBuildExt(build_ext):
-                 return platform
-         return sys.platform
- 
-+    def add_multiarch_paths(self):
-+        # Debian/Ubuntu multiarch support.
-+        # https://wiki.ubuntu.com/MultiarchSpec
-+        if not find_executable('dpkg-architecture'):
-+            return
-+        tmpfile = os.path.join(self.build_temp, 'multiarch')
-+        if not os.path.exists(self.build_temp):
-+            os.makedirs(self.build_temp)
-+        ret = os.system(
-+            'dpkg-architecture -qDEB_HOST_MULTIARCH > %s 2> /dev/null' %
-+            tmpfile)
-+        try:
-+            if ret >> 8 == 0:
-+                with open(tmpfile) as fp:
-+                    multiarch_path_component = fp.readline().strip()
-+                add_dir_to_list(self.compiler.library_dirs,
-+                                '/usr/lib/' + multiarch_path_component)
-+                add_dir_to_list(self.compiler.include_dirs,
-+                                '/usr/include/' + multiarch_path_component)
-+        finally:
-+            os.unlink(tmpfile)
-+
-     def detect_modules(self):
-         # Ensure that /usr/local is always used
-         add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-         add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-+        self.add_multiarch_paths()
- 
-         # Add paths specified in the environment variables LDFLAGS and
-         # CPPFLAGS for header and library files.
-