From 4bc0cbb6de8cd5c14b863cc8b04f4e8738d8403f Mon Sep 17 00:00:00 2001
From: Martyn Welch <martyn.welch@collabora.com>
Date: Wed, 27 Mar 2019 12:39:39 +0000
Subject: [PATCH] Add Eclipse IDE back to SDK image
The Eclipse SDK is currently not being installed in the SDK image. Add it
back, remove redundant old entries in the Debos configuration and tweak
the desktop file to take into account it's new name and icon.
Signed-off-by: Martyn Welch <martyn.welch@collabora.com>
---
apertis-ospack-sdk.yaml | 6 +-----
.../etc/skel/Desktop/eclipse.desktop | 4 ++--
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/apertis-ospack-sdk.yaml b/apertis-ospack-sdk.yaml
index 229ab91c..0a146b3f 100644
--- a/apertis-ospack-sdk.yaml
+++ b/apertis-ospack-sdk.yaml
@@ -578,7 +578,6 @@ actions:
- action: apt
description: "SDK packages (CM)"
packages:
- #- apertis-eclipse-plugins
#- barkway-dev
#- barkway-doc
#- beckfoot-dev
@@ -588,10 +587,7 @@ actions:
#- didcot
#- didcot-doc
- dlt-daemon
- #- eclipse
- #- eclipse-cdt
- #- eclipse-cdt-launch-remote
- #- eclipse-rcp
+ - eclipse-ide-cpp
- folks-tools
#- frome
- geoclue-2.0
diff --git a/overlays/sdk-desktop-icon-eclipse/etc/skel/Desktop/eclipse.desktop b/overlays/sdk-desktop-icon-eclipse/etc/skel/Desktop/eclipse.desktop
index f63d9ec9..88813901 100755
--- a/overlays/sdk-desktop-icon-eclipse/etc/skel/Desktop/eclipse.desktop
+++ b/overlays/sdk-desktop-icon-eclipse/etc/skel/Desktop/eclipse.desktop
@@ -2,7 +2,7 @@
Type=Application
Name=Eclipse
Comment=Eclipse Integrated Development Environment
-Icon=eclipse
-Exec=eclipse
+Icon=eclipse-ide-cpp
+Exec=eclipse-ide-cpp %u
Terminal=false
Categories=Development;IDE;Java;
--
GitLab