From a9413082a932e613a95e4c0ca60a4dc727891283 Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Tue, 16 Dec 2014 23:49:05 +0100
Subject: [PATCH] Move dependency to IPython notebook to a right place in
 Python plugin.

---
 python/build/python-plugin-dependencies.xml      | 2 ++
 python/pluginSrc/META-INF/python-plugin-core.xml | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/python/build/python-plugin-dependencies.xml b/python/build/python-plugin-dependencies.xml
index 413707553e5d..601542756001 100644
--- a/python/build/python-plugin-dependencies.xml
+++ b/python/build/python-plugin-dependencies.xml
@@ -5,4 +5,6 @@
   <depends optional="true" config-file="python-rest-plugin.xml">org.jetbrains.plugins.rest</depends>
   <depends optional="true" config-file="intellilang-python-support.xml">org.intellij.intelliLang</depends>
 
+  <xi:include href="/META-INF/ipython-notebook.xml" xpointer="xpointer(/idea-plugin/*)"/>
+
 </idea-plugin>
diff --git a/python/pluginSrc/META-INF/python-plugin-core.xml b/python/pluginSrc/META-INF/python-plugin-core.xml
index 3508ae9d68ba..33b1489475b9 100644
--- a/python/pluginSrc/META-INF/python-plugin-core.xml
+++ b/python/pluginSrc/META-INF/python-plugin-core.xml
@@ -2,8 +2,6 @@
   <!-- Components and extensions declared in this file work ONLY in the Python plugin,
        both Community and Professional versions. -->
 
-  <!--<xi:include href="/META-INF/ipython-notebook.xml" xpointer="xpointer(/idea-plugin/*)"/>-->
-
   <extensions defaultExtensionNs="com.intellij">
     <moduleType id="PYTHON_MODULE" implementationClass="com.jetbrains.python.module.PythonModuleType"/>
     <facetType implementation="com.jetbrains.python.facet.PythonFacetType"/>