From 277a96f7b762fe3e18abed7bb9d7caf299ac251f Mon Sep 17 00:00:00 2001
From: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Date: Thu, 2 Mar 2017 13:11:16 -0500
Subject: [PATCH] Bug 511961 - Fix stand-alone debugger product not starting
 with Oxygen

The order of the auto-started plugins had to be tweaked.

Change-Id: I0f50b5d34ae0f30d8f3dd3fab27d7cb704ed4c9d
---
 .../org.eclipse.cdt.debug.application.product/debug.product | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/debug/org.eclipse.cdt.debug.application.product/debug.product b/debug/org.eclipse.cdt.debug.application.product/debug.product
index dbf9d3afe9e..bd8f9e925e5 100644
--- a/debug/org.eclipse.cdt.debug.application.product/debug.product
+++ b/debug/org.eclipse.cdt.debug.application.product/debug.product
@@ -22,8 +22,6 @@
       </vmArgsLin>
       <vmArgsMac>-Xms100m -Xmx512m  -XstartOnFirstThread -Dosgi.requiredJavaVersion=1.8 -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
-      <vmArgsSol>-Xms100m -Xmx512m   -Dosgi.requiredJavaVersion=1.8
-      </vmArgsSol>
       <vmArgsWin>-Xms100m -Xmx512m   -Dosgi.requiredJavaVersion=1.8
       </vmArgsWin>
    </launcherArgs>
@@ -33,7 +31,6 @@
    <launcher name="cdtdebug">
       <linux icon="../org.eclipse.cdt.debug.application/icons/cc.xpm"/>
       <macosx icon="../org.eclipse.cdt.debug.application/icons/cc.icns"/>
-      <solaris/>
       <win useIco="true">
          <ico path="../org.eclipse.cdt.debug.application/icons/cc.ico"/>
          <bmp/>
@@ -384,7 +381,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
    <configurations>
       <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
       <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="1" />
+      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
       <plugin id="org.eclipse.osgi" autoStart="true" startLevel="-1" />
       <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="3" />