From c95b82b5413ea14c22fb9143de91983bdf29efd2 Mon Sep 17 00:00:00 2001
From: Doug Schaefer <dschaefer@qnx.com>
Date: Wed, 18 Feb 2015 20:38:56 -0500
Subject: [PATCH] Bug 460298 Fix up dependencies so terminal features end up in
 repo.

Change-Id: Ie7ef999c90fd18909b5f4ba6f2dae968c3c9f490
Signed-off-by: Doug Schaefer <dschaefer@qnx.com>
---
 .../feature.xml                                      | 12 ++++--------
 .../feature.xml                                      |  5 ++++-
 .../feature.xml                                      |  5 ++++-
 .../feature.xml                                      |  5 ++++-
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/terminal/features/org.eclipse.tm.terminal.remote.sdk.feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.remote.sdk.feature/feature.xml
index d13778bc29b..86bf1fb39ec 100644
--- a/terminal/features/org.eclipse.tm.terminal.remote.sdk.feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.remote.sdk.feature/feature.xml
@@ -34,15 +34,11 @@
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
+   <includes
+         id="org.eclipse.tm.terminal.remote.feature"
+         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"/>
-      <import feature="org.eclipse.tm.terminal.remote.feature" version="4.0.0" match="compatible"/>
       <import feature="org.eclipse.tm.terminal.sdk.feature" version="4.0.0" match="compatible"/>
    </requires>
 
diff --git a/terminal/features/org.eclipse.tm.terminal.serial.sdk.feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.serial.sdk.feature/feature.xml
index 4749e583d0a..d88009ad936 100644
--- a/terminal/features/org.eclipse.tm.terminal.serial.sdk.feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.serial.sdk.feature/feature.xml
@@ -35,9 +35,12 @@
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
+   <includes
+         id="org.eclipse.tm.terminal.serial.feature"
+         version="0.0.0"/>
+
    <requires>
       <import feature="org.eclipse.tm.terminal.sdk.feature" version="4.0.0" match="compatible"/>
-      <import feature="org.eclipse.tm.terminal.serial.feature" version="4.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/terminal/features/org.eclipse.tm.terminal.ssh.sdk.feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.ssh.sdk.feature/feature.xml
index 7c550ec251c..9057e585ef6 100644
--- a/terminal/features/org.eclipse.tm.terminal.ssh.sdk.feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.ssh.sdk.feature/feature.xml
@@ -35,9 +35,12 @@
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
+   <includes
+         id="org.eclipse.tm.terminal.ssh.feature"
+         version="0.0.0"/>
+
    <requires>
       <import feature="org.eclipse.tm.terminal.sdk.feature" version="4.0.0" match="compatible"/>
-      <import feature="org.eclipse.tm.terminal.ssh.feature" version="4.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/terminal/features/org.eclipse.tm.terminal.telnet.sdk.feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.telnet.sdk.feature/feature.xml
index 6041e27dbf1..37148d190eb 100644
--- a/terminal/features/org.eclipse.tm.terminal.telnet.sdk.feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.telnet.sdk.feature/feature.xml
@@ -35,9 +35,12 @@
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
+   <includes
+         id="org.eclipse.tm.terminal.telnet.feature"
+         version="0.0.0"/>
+
    <requires>
       <import feature="org.eclipse.tm.terminal.sdk.feature" version="4.0.0" match="compatible"/>
-      <import feature="org.eclipse.tm.terminal.telnet.feature" version="4.0.0" match="compatible"/>
    </requires>
 
    <plugin