From f5568366aef26b24e953a68c559c94d99808763c Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Tue, 8 Dec 2015 01:33:10 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=B1=D0=B8=D1=80=D0=B0=D0=BD=D0=BD=D1=8B=D0=B5?= =?UTF-8?q?=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- profiles/templates/3.2/6_ac_update_sync/world/0-ini | 2 +- profiles/templates/3.2/6_ac_update_sync/world/create/tools | 2 +- .../3.2/6_ac_update_sync/world/update/200-299/235 | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 profiles/templates/3.2/6_ac_update_sync/world/update/200-299/235 diff --git a/profiles/templates/3.2/6_ac_update_sync/world/0-ini b/profiles/templates/3.2/6_ac_update_sync/world/0-ini index 8829ee1..ebabb1e 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/0-ini +++ b/profiles/templates/3.2/6_ac_update_sync/world/0-ini @@ -1,4 +1,4 @@ # Calculate path=/etc/calculate name=ini.env format=samba cl_update_world==rebuild||cl_update_world==merge||ini(overlay-distros.world)== [overlay-distros] -world = 234 +world = 235 diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/tools b/profiles/templates/3.2/6_ac_update_sync/world/create/tools index 28b8e50..edab3f1 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/tools +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/tools @@ -74,7 +74,7 @@ sys-apps/acl app-misc/mc #in# -#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CLDX+)!=# +#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CLD+, CLDX+)!=# www-plugins/adobe-flash #in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/235 b/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/235 new file mode 100644 index 0000000..3292540 --- /dev/null +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/235 @@ -0,0 +1,7 @@ +# Calculate format=world name=world ini(overlay-distros.world)<235 + +#-ini(overlay-distros.world,235)-# + +#?in(os_linux_pkglist, CLD+)!=# +www-plugins/adobe-flash +#in#