From ca7f9620d56a079eb1122a500b32c07f0751540e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 9 Aug 2020 00:52:12 +0200 Subject: [PATCH] Skip the installation of files that conflict with files that are already contained in tdebase and tdeutils. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 303aa70c6187f9a41501784db213acd0cfb180d8) --- systemsettings/menu/CMakeLists.txt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/systemsettings/menu/CMakeLists.txt b/systemsettings/menu/CMakeLists.txt index b67407e..2e70eb6 100644 --- a/systemsettings/menu/CMakeLists.txt +++ b/systemsettings/menu/CMakeLists.txt @@ -1,12 +1,19 @@ ##### other data +# intentionally omitted files that are already part of +# ...tdebase +# kcmfontinst.desktop +# tde-settings-power.directory +# tde-settings-system.directory +# ...tdeutils +# laptop.desktop + + tde_create_translated_desktop( SOURCE audioencoding.desktop defaultapplication.desktop - kcmfontinst.desktop kcm_knetworkconfmodule_ss.desktop - laptop.desktop medianotifications.desktop ) @@ -28,11 +35,9 @@ tde_create_translated_desktop( tde-settings-notifications.directory tde-settings-panel.directory tde-settings-personal.directory - tde-settings-power.directory tde-settings-regional.directory tde-settings-sharing.directory tde-settings-splashscreen.directory - tde-settings-system.directory tde-settings-useraccount.directory tde-settings-windowbehavior.directory tde-system-settings.directory