From 0b93e8116ed81f0e5b366262b0af903b0fb3d580 Mon Sep 17 00:00:00 2001
From: Alvaro Sanchez-Leon <alvsan09@gmail.com>
Date: Fri, 29 Apr 2016 15:37:27 -0400
Subject: [PATCH] Bug 452356 - C/C++ remote launch uses o.e.remote -  explicit
 dependency at feature level

Adding an explicit dependency to o.e.remote at feature level,
so the dependecies are loaded at the installation of the
launch remote feature

Change-Id: I90f6bd29cd1b6f2efc46e241520621bbd256ffef
---
 .../org.eclipse.cdt.launch.remote-feature/feature.properties  | 4 ++--
 cross/org.eclipse.cdt.launch.remote-feature/feature.xml       | 2 +-
 .../sourceTemplateFeature/feature.properties                  | 2 +-
 releng/org.eclipse.cdt.target/cdt.target                      | 3 +--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/cross/org.eclipse.cdt.launch.remote-feature/feature.properties b/cross/org.eclipse.cdt.launch.remote-feature/feature.properties
index aa5633ed429..4dc6700a516 100644
--- a/cross/org.eclipse.cdt.launch.remote-feature/feature.properties
+++ b/cross/org.eclipse.cdt.launch.remote-feature/feature.properties
@@ -15,13 +15,13 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=C/C++ Remote Launch (Requires RSE Remote System Explorer)
+featureName=C/C++ Remote Launch
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse CDT
 
 # "description" property - description of the feature
-description=Launch configuration for running C/C++ executables on remote machines using the Remote System Explorer, and debugging through gdbserver.
+description=Launch configuration for running C/C++ executables on remote machines and debugging through gdbserver.
 
 # copyright
 copyright=\
diff --git a/cross/org.eclipse.cdt.launch.remote-feature/feature.xml b/cross/org.eclipse.cdt.launch.remote-feature/feature.xml
index 796d47688cd..eda5b3aff74 100644
--- a/cross/org.eclipse.cdt.launch.remote-feature/feature.xml
+++ b/cross/org.eclipse.cdt.launch.remote-feature/feature.xml
@@ -20,7 +20,7 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.rse" version="0.0.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.remote" version="0.0.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/cross/org.eclipse.cdt.launch.remote-feature/sourceTemplateFeature/feature.properties b/cross/org.eclipse.cdt.launch.remote-feature/sourceTemplateFeature/feature.properties
index 1c60f3a57e0..bed084dccc2 100644
--- a/cross/org.eclipse.cdt.launch.remote-feature/sourceTemplateFeature/feature.properties
+++ b/cross/org.eclipse.cdt.launch.remote-feature/sourceTemplateFeature/feature.properties
@@ -21,7 +21,7 @@ featureName=C/C++ Remote Launch Source
 providerName=Eclipse CDT
 
 # "description" property - description of the feature
-description=Launch configuration for running C/C++ executables on remote machines using the Remote System Explorer, and debugging through gdbserver. Source code.
+description=Launch configuration for running C/C++ executables on remote machines and debugging through gdbserver. Source code.
 
 copyright=\
 Copyright (c) 2009, 2011 Wind River Systems and others.\n\
diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index ccc246da219..0a6a91cfbdc 100644
--- a/releng/org.eclipse.cdt.target/cdt.target
+++ b/releng/org.eclipse.cdt.target/cdt.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="cdt" sequenceNumber="11">
+<?pde version="3.8"?><target name="cdt" sequenceNumber="12">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.apache.commons.compress" version="0.0.0"/>
@@ -27,7 +27,6 @@
 <repository location="http://download.eclipse.org/technology/swtbot/snapshots/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.rse.feature.group" version="0.0.0"/>
 <repository location="http://download.eclipse.org/tm/updates/4.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">