From 8cf4e8f3377b4ac44af690d858c3373369f23a8d Mon Sep 17 00:00:00 2001
From: Vivian Kong <vivkong@ca.ibm.com>
Date: Thu, 24 Apr 2008 16:55:30 +0000
Subject: [PATCH] fix ordering of required plugins/features

---
 build/org.eclipse.cdt.gnu.build-feature/feature.xml |  4 ++--
 debug/org.eclipse.cdt.gnu.debug-feature/feature.xml | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/build/org.eclipse.cdt.gnu.build-feature/feature.xml b/build/org.eclipse.cdt.gnu.build-feature/feature.xml
index 5ab997a8c98..b3c13d95a00 100644
--- a/build/org.eclipse.cdt.gnu.build-feature/feature.xml
+++ b/build/org.eclipse.cdt.gnu.build-feature/feature.xml
@@ -17,12 +17,12 @@
       [Enter License Description here.]
    </license>
 
-   <requires>
+   <requires>      
       <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.cdt.managedbuilder.core" version="5.0.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>
 
    <plugin
diff --git a/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml b/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml
index 239dbc987e0..e3bfdabadd9 100644
--- a/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml
+++ b/debug/org.eclipse.cdt.gnu.debug-feature/feature.xml
@@ -18,15 +18,11 @@
    </license>
 
    <requires>
-      <import plugin="org.eclipse.cdt.debug.core" version="5.0.0" match="compatible"/>
+
       <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.cdt.core" version="5.0.0" match="compatible"/>
       <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.cdt.debug.mi.core" version="5.0.0" match="compatible"/>
-      <import plugin="org.eclipse.cdt.debug.ui" version="5.0.0" match="compatible"/>
-      <import plugin="org.eclipse.cdt.ui" version="5.0.0" match="compatible"/>
       <import plugin="org.eclipse.debug.ui" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.ui.console" version="3.1.100" match="compatible"/>
       <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
@@ -34,6 +30,11 @@
       <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"/>
+      <import plugin="org.eclipse.cdt.debug.mi.core" version="5.0.0" match="compatible"/>
+      <import plugin="org.eclipse.cdt.debug.ui" version="5.0.0" match="compatible"/>
    </requires>
 
    <plugin