From c7742541a631635c280d1d935e9c25d3aab01004 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Thu, 19 Nov 2015 12:11:40 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=20=D0=BE?= =?UTF-8?q?=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?= 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 +- .../world/update/200-299/{216 => 217} | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) rename profiles/templates/3.2/6_ac_update_sync/world/update/200-299/{216 => 217} (53%) 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 af10430..72e3ecb 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 = 216 +world = 217 diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/216 b/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/217 similarity index 53% rename from profiles/templates/3.2/6_ac_update_sync/world/update/200-299/216 rename to profiles/templates/3.2/6_ac_update_sync/world/update/200-299/217 index 0a2c299..1b4bd9d 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/216 +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/217 @@ -1,10 +1,15 @@ -# Calculate format=world name=world ini(overlay-distros.world)<216 +# Calculate format=world name=world ini(overlay-distros.world)<217 -#-ini(overlay-distros.world,216)-# +#-ini(overlay-distros.world,217)-# #?in(os_linux_pkglist, CLD, CLDM, CLDX)!=# -!media-video/smplayer -#media-video/smtube +!media-video/smtube +media-video/smplayer +#in# + +#?in(os_linux_pkglist, CLD, CLDX)!=# +!mate-extra/mate-user-guide +#in #?in(os_linux_pkglist, CLDM)!=# mate-extra/mate-user-guide