From d78f11c5ff492caa11e75ed4f9a3786270ddc719 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Tue, 4 Dec 2018 09:56:56 +0300 Subject: [PATCH] =?UTF-8?q?CLD:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE=20=D1=81=D0=BA=D1=80=D1=8B=D1=82=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BF=D0=BB=D0=B0=D0=B7=D0=BC=D0=BE=D0=B9=D0=B4=D0=B0?= =?UTF-8?q?=20=D0=B3=D1=80=D0=BE=D0=BC=D0=BA=D0=BE=D1=81=D1=82=D0=B8=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=BD=D0=B0=D0=BB=D0=B8=D1=87=D0=B8=D0=B8?= =?UTF-8?q?=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=B0=20kmix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Вместо metadata.desktop в plasma-pa-5.14 используется metadata.json Шаблоны из live перенесены в merge, так как настройка зависит только от наличия пакетов в системе --- .../Depends/kmix | 0 .../kde-plasma/plasma-pa/.calculate_directory | 0 .../kde-plasma/plasma-pa/metadata.desktop | 2 +- .../kde-plasma/plasma-pa/metadata.desktop.remove | 1 + .../2_ac_install_merge/kde-plasma/plasma-pa/metadata.json | 8 ++++++++ .../1-merge/kde-plasma/.calculate_directory | 1 - 6 files changed, 10 insertions(+), 2 deletions(-) rename profiles/templates/3.6/{3_ac_install_live => 2_ac_install_merge}/Depends/kmix (100%) rename profiles/templates/3.6/{3_ac_install_live/1-merge => 2_ac_install_merge}/kde-plasma/plasma-pa/.calculate_directory (100%) rename profiles/templates/3.6/{3_ac_install_live/1-merge => 2_ac_install_merge}/kde-plasma/plasma-pa/metadata.desktop (88%) create mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-plasma/plasma-pa/metadata.desktop.remove create mode 100644 profiles/templates/3.6/2_ac_install_merge/kde-plasma/plasma-pa/metadata.json delete mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/kde-plasma/.calculate_directory 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