diff --git a/profiles/templates/3.6/3_ac_install_live/Depends/kmix b/profiles/templates/3.6/2_ac_install_merge/Depends/kmix similarity index 100% rename from profiles/templates/3.6/3_ac_install_live/Depends/kmix rename to profiles/templates/3.6/2_ac_install_merge/Depends/kmix diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/kde-plasma/plasma-pa/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/kde-plasma/plasma-pa/.calculate_directory similarity index 100% rename from profiles/templates/3.6/3_ac_install_live/1-merge/kde-plasma/plasma-pa/.calculate_directory rename to profiles/templates/3.6/2_ac_install_merge/kde-plasma/plasma-pa/.calculate_directory diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/kde-plasma/plasma-pa/metadata.desktop b/profiles/templates/3.6/2_ac_install_merge/kde-plasma/plasma-pa/metadata.desktop similarity index 88% rename from profiles/templates/3.6/3_ac_install_live/1-merge/kde-plasma/plasma-pa/metadata.desktop rename to profiles/templates/3.6/2_ac_install_merge/kde-plasma/plasma-pa/metadata.desktop index 1ba7dd777..a4d802a44 100644 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/kde-plasma/plasma-pa/metadata.desktop +++ b/profiles/templates/3.6/2_ac_install_merge/kde-plasma/plasma-pa/metadata.desktop @@ -1,4 +1,4 @@ -# Calculate format=kde +# Calculate format=kde pkg(kde-plasma/plasma-pa)<5.14 [Desktop Entry] #?pkg(kde-apps/kmix)!=# diff --git a/profiles/templates/3.6/2_ac_install_merge/kde-plasma/plasma-pa/metadata.desktop.remove b/profiles/templates/3.6/2_ac_install_merge/kde-plasma/plasma-pa/metadata.desktop.remove new file mode 100644 index 000000000..cafdfeda8 --- /dev/null +++ b/profiles/templates/3.6/2_ac_install_merge/kde-plasma/plasma-pa/metadata.desktop.remove @@ -0,0 +1 @@ +# Calculate name=metadata.desktop append=remove pkg(kde-plasma/plasma-pa)>=5.14 diff --git a/profiles/templates/3.6/2_ac_install_merge/kde-plasma/plasma-pa/metadata.json b/profiles/templates/3.6/2_ac_install_merge/kde-plasma/plasma-pa/metadata.json new file mode 100644 index 000000000..6a803917e --- /dev/null +++ b/profiles/templates/3.6/2_ac_install_merge/kde-plasma/plasma-pa/metadata.json @@ -0,0 +1,8 @@ +# Calculate format=json +{ +#?pkg(kde-apps/kmix)!=# + "X-Plasma-NotificationArea": "false" +#!pkg# + "X-Plasma-NotificationArea": "true" +#pkg# +} diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/kde-plasma/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/kde-plasma/.calculate_directory deleted file mode 100644 index 720d52e47..000000000 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/kde-plasma/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip