From 0bdbcd7e622b1ede9190bc1b4e233a44c96c847a 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: Mon, 23 Dec 2019 16:58:06 +0300 Subject: [PATCH] =?UTF-8?q?kde-plasma/plasma-workspace:=20=D0=B8=D1=81?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D1=81=D1=86=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=D1=80=D0=B8=D0=B9=20=D0=B0=D0=B2=D1=82=D0=BE=D0=B2?= =?UTF-8?q?=D1=85=D0=BE=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../3.6/2_ac_install_merge/kde-plasma/plasma-workspace/Plasma | 4 ++++ profiles/templates/3.6/6_ac_update_sync/remerge/0-ini | 2 +- profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191223 | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191223 diff --git a/profiles/templates/3.6/2_ac_install_merge/kde-plasma/plasma-workspace/Plasma b/profiles/templates/3.6/2_ac_install_merge/kde-plasma/plasma-workspace/Plasma index ee68b0384..16131ad04 100644 --- a/profiles/templates/3.6/2_ac_install_merge/kde-plasma/plasma-workspace/Plasma +++ b/profiles/templates/3.6/2_ac_install_merge/kde-plasma/plasma-workspace/Plasma @@ -1,2 +1,6 @@ # Calculate chmod=0755 +#?pkg(kde-plasma/plasma-workspace)<5.17.4# startkde +#!pkg# +startplasma-x11 +#pkg# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini b/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini index 50c3952e2..48111699c 100644 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini +++ b/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini @@ -2,4 +2,4 @@ [overlay-calculate] # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system -remerge = 20191219 +remerge = 20191223 diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191223 b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191223 new file mode 100644 index 000000000..117f8cc93 --- /dev/null +++ b/profiles/templates/3.6/6_ac_update_sync/remerge/2019/20191223 @@ -0,0 +1,4 @@ +# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=kde-plasma/plasma-workspace + +[overlay-calculate] +remerge = #-cl_pass_file-#