From 9683de1e528ce4820adaeff6ce5ca0f66de7b6a3 Mon Sep 17 00:00:00 2001
From: Uwe Stieber <uwe.stieber@windriver.com>
Date: Mon, 22 Jul 2013 15:12:38 +0200
Subject: [PATCH] Terminal: Connector type featues must not have any dependency
 to o.e.tm.terminal.view

---
 .../feature.xml                                  | 10 +++++-----
 .../feature.xml                                  | 16 +---------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/features/org.eclipse.tm.terminal.local-feature/feature.xml b/features/org.eclipse.tm.terminal.local-feature/feature.xml
index 126af2fe90d..73ed3ac64b6 100644
--- a/features/org.eclipse.tm.terminal.local-feature/feature.xml
+++ b/features/org.eclipse.tm.terminal.local-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.tm.terminal.local"
       label="%featureName"
-      version="0.2.300.qualifier"
+      version="0.2.400.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -35,16 +35,16 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.cdt.platform" version="7.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.core" version="5.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.debug.core"/>
       <import plugin="org.eclipse.debug.ui"/>
       <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.tm.terminal" version="3.2.2" match="equivalent"/>
-      <import plugin="org.eclipse.tm.terminal.view" version="2.4.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.ui.externaltools"/>
+      <import feature="org.eclipse.cdt.platform" version="7.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.tm.terminal" version="3.2.0" match="equivalent"/>
+      <import plugin="org.eclipse.cdt.core" version="5.2.0" match="compatible"/>
+      <import plugin="org.eclipse.core.variables"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.tm.terminal.local.sdk-feature/feature.xml b/features/org.eclipse.tm.terminal.local.sdk-feature/feature.xml
index d5ae7aeeea8..a55b448af50 100644
--- a/features/org.eclipse.tm.terminal.local.sdk-feature/feature.xml
+++ b/features/org.eclipse.tm.terminal.local.sdk-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.tm.terminal.local.sdk"
       label="%featureName"
-      version="0.3.100.qualifier"
+      version="0.3.200.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -38,24 +38,10 @@
          id="org.eclipse.tm.terminal.local"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.tm.terminal.view"
-         version="0.0.0"/>
-
    <includes
          id="org.eclipse.tm.terminal"
          version="0.0.0"/>
 
-   <requires>
-      <import plugin="org.eclipse.cdt.core" version="5.2.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.externaltools"/>
-   </requires>
-
    <plugin
          id="org.eclipse.tm.terminal.local.source"
          download-size="25"