Merge with upstream

setup.py

@@ -132,7 +132,8 @@ if 'setuptools' in sys.modules:
             'pycolor = IPython.PyColorize:main',
             'ipcontroller = IPython.kernel.scripts.ipcontroller:main',
             'ipengine = IPython.kernel.scripts.ipengine:main',
-            'ipcluster = IPython.kernel.scripts.ipcluster:main'
+            'ipcluster = IPython.kernel.scripts.ipcluster:main',
+            'ipythonx = IPython.frontend.wx.ipythonx:main'
         ]
     }
     setup_args["extras_require"] = dict(

setupbase.py

@@ -107,6 +107,10 @@ def find_packages():
     add_package(packages, 'external')
     add_package(packages, 'gui')
     add_package(packages, 'gui.wx')
+    add_package(packages, 'frontend', tests=True)
+    add_package(packages, 'frontend._process')
+    add_package(packages, 'frontend.wx')
+    add_package(packages, 'frontend.cocoa', tests=True)
     add_package(packages, 'kernel', config=True, tests=True, scripts=True)
     add_package(packages, 'kernel.core', config=True, tests=True)
     add_package(packages, 'testing', tests=True)
@@ -181,6 +185,7 @@ def find_scripts():
     scripts.append('IPython/kernel/scripts/ipcontroller')
     scripts.append('IPython/kernel/scripts/ipcluster')
     scripts.append('scripts/ipython')
+    scripts.append('scripts/ipythonx')
     scripts.append('scripts/pycolor')
     scripts.append('scripts/irunner')
     
@@ -229,4 +234,4 @@ def check_for_dependencies():
     check_for_sphinx()
     check_for_pygments()
     check_for_nose()
-    check_for_pexpect()
+    check_for_pexpect()