From df694d61ef3b8fb2648f552c44d1f55deaa28b87 Mon Sep 17 00:00:00 2001
From: Uwe Stieber <uwe.stieber@windriver.com>
Date: Thu, 19 Feb 2015 08:28:11 +0100
Subject: [PATCH] Terminal: SDK features includes corresponding runtime
 features instead of just requiring them

---
 .../org.eclipse.tm.terminal.sdk-feature/feature.xml         | 5 ++++-
 .../org.eclipse.tm.terminal.sdk.feature/feature.xml         | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/terminal/deprecated/features/org.eclipse.tm.terminal.sdk-feature/feature.xml b/terminal/deprecated/features/org.eclipse.tm.terminal.sdk-feature/feature.xml
index f2143184dfd..d1d437578de 100644
--- a/terminal/deprecated/features/org.eclipse.tm.terminal.sdk-feature/feature.xml
+++ b/terminal/deprecated/features/org.eclipse.tm.terminal.sdk-feature/feature.xml
@@ -36,8 +36,11 @@
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
+   <includes
+         id="org.eclipse.tm.terminal.view"
+         version="0.0.0"/>
+
    <requires>
-      <import feature="org.eclipse.tm.terminal.view" version="4.0.0" match="compatible"/>
       <import feature="org.eclipse.tm.terminal.serial.sdk.feature" version="4.0.0" match="compatible"/>
       <import feature="org.eclipse.tm.terminal.ssh.sdk.feature" version="4.0.0" match="compatible"/>
       <import feature="org.eclipse.tm.terminal.telnet.sdk.feature" version="4.0.0" match="compatible"/>
diff --git a/terminal/features/org.eclipse.tm.terminal.sdk.feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.sdk.feature/feature.xml
index 67e29c617ea..981b48733a0 100644
--- a/terminal/features/org.eclipse.tm.terminal.sdk.feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.sdk.feature/feature.xml
@@ -36,9 +36,9 @@
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.7"/>
    </url>
 
-   <requires>
-      <import feature="org.eclipse.tm.terminal.feature" version="4.0.0" match="compatible"/>
-   </requires>
+   <includes
+         id="org.eclipse.tm.terminal.feature"
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.tm.terminal.source"