From f1f632b32587d690a2ea71423ad580680b7e780e Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Fri, 4 Dec 2015 19:25:16 +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=D0=BD=D0=B0=D1=80=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 | 1 + .../3.2/6_ac_update_sync/world/update/200-299/{230 => 231} | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) rename profiles/templates/3.2/6_ac_update_sync/world/update/200-299/{230 => 231} (86%) 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 2076785..f2c6201 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 = 230 +world = 231 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 ea3b728..5153650 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 @@ -197,6 +197,7 @@ x11-terms/guake x11-terms/terminator x11-terms/tilda x11-themes/geany-themes +www-plugins/adobe-flash #in# #?in(os_linux_pkglist, CDS+)!=# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/230 b/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/231 similarity index 86% rename from profiles/templates/3.2/6_ac_update_sync/world/update/200-299/230 rename to profiles/templates/3.2/6_ac_update_sync/world/update/200-299/231 index 522fa1b..9fe1b4a 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/230 +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/231 @@ -1,6 +1,6 @@ -# Calculate format=world name=world ini(overlay-distros.world)<230 +# Calculate format=world name=world ini(overlay-distros.world)<231 -#-ini(overlay-distros.world,230)-# +#-ini(overlay-distros.world,231)-# #?in(os_linux_pkglist, CLDX+, CDS+)!=# !net-p2p/bittorrent @@ -15,6 +15,7 @@ media-gfx/freecad media-gfx/librecad media-video/pitivi www-client/vivaldi +www-plugins/adobe-flash x11-terms/qterminal #in#