From 72580d75596907febb629a81b4062c11ff73543b Mon Sep 17 00:00:00 2001
From: Doug Schaefer <doug.schaefer@windriver.com>
Date: Fri, 9 May 2008 15:11:34 +0000
Subject: [PATCH] Fix up plugin dependencies.

---
 build/org.eclipse.cdt.gnu.build-feature/feature.xml | 1 -
 debug/org.eclipse.cdt.gnu.debug-feature/feature.xml | 1 -
 releng/org.eclipse.cdt-feature/feature.xml          | 4 ----
 releng/org.eclipse.cdt.platform-feature/feature.xml | 6 ++++++
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/org.eclipse.cdt.gnu.build-feature/feature.xml b/build/org.eclipse.cdt.gnu.build-feature/feature.xml
index 70312f7981b..817dd56d94a 100644
--- a/build/org.eclipse.cdt.gnu.build-feature/feature.xml
+++ b/build/org.eclipse.cdt.gnu.build-feature/feature.xml
@@ -25,7 +25,6 @@
       <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.cdt.core" version="5.0.0" match="compatible"/>
       <import plugin="org.eclipse.core.resources"/>
-      <import feature="org.eclipse.cdt.platform" version="5.0.0.qualifier"/>
       <import plugin="org.eclipse.cdt.managedbuilder.core" version="5.0.0" match="compatible"/>
    </requires>
 
diff --git a/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml b/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml
index e057e6a3bb2..7110ac00a41 100644
--- a/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml
+++ b/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml
@@ -32,7 +32,6 @@
       <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.core.expressions" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.core.variables" version="3.1.100" match="compatible"/>
-      <import feature="org.eclipse.cdt.platform" version="5.0.0.qualifier"/>
       <import plugin="org.eclipse.cdt.core" version="5.0.0" match="compatible"/>
       <import plugin="org.eclipse.cdt.ui" version="5.0.0" match="compatible"/>
       <import plugin="org.eclipse.cdt.debug.core" version="5.0.0" match="compatible"/>
diff --git a/releng/org.eclipse.cdt-feature/feature.xml b/releng/org.eclipse.cdt-feature/feature.xml
index 076fbcf5b60..5ed8058a7db 100644
--- a/releng/org.eclipse.cdt-feature/feature.xml
+++ b/releng/org.eclipse.cdt-feature/feature.xml
@@ -31,10 +31,6 @@
          version="0.0.0"/>
 
    <requires>
-      <import plugin="org.eclipse.help" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.cheatsheets" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.intro" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.intro.universal"/>
       <import feature="org.eclipse.cdt.platform" version="5.0.0"/>
    </requires>
 
diff --git a/releng/org.eclipse.cdt.platform-feature/feature.xml b/releng/org.eclipse.cdt.platform-feature/feature.xml
index fbe8881c167..2484d939240 100644
--- a/releng/org.eclipse.cdt.platform-feature/feature.xml
+++ b/releng/org.eclipse.cdt.platform-feature/feature.xml
@@ -57,6 +57,12 @@
       <import plugin="org.eclipse.ltk.ui.refactoring" version="3.4.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.navigator.resources" version="3.3.100" match="greaterOrEqual"/>
       <import plugin="com.ibm.icu"/>
+      <import plugin="org.eclipse.ui.intro.universal"/>
+      <import plugin="org.eclipse.cdt.core" version="5.0.0" match="compatible"/>
+      <import plugin="org.eclipse.cdt.debug.core" version="5.0.0" match="compatible"/>
+      <import plugin="org.eclipse.cdt.ui" version="5.0.0" match="compatible"/>
+      <import plugin="org.eclipse.cdt.make.core" version="5.0.0" match="compatible"/>
+      <import plugin="org.eclipse.cdt.managedbuilder.core" version="5.0.0" match="compatible"/>
    </requires>
 
    <plugin