From 503ebdc11c29a03ee755ee8abe241756847e3abb Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Tue, 17 Nov 2015 23:19:47 +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 +- .../templates/3.2/6_ac_update_sync/world/create/mate | 1 + .../templates/3.2/6_ac_update_sync/world/create/server | 4 ++++ .../templates/3.2/6_ac_update_sync/world/create/tools | 1 + .../6_ac_update_sync/world/update/200-299/{212 => 213} | 10 ++++++++-- 5 files changed, 15 insertions(+), 3 deletions(-) rename profiles/templates/3.2/6_ac_update_sync/world/update/200-299/{212 => 213} (67%) 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 944e5de..ecacc3a 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 = 212 +world = 213 diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/mate b/profiles/templates/3.2/6_ac_update_sync/world/create/mate index 8626d39..3c5fbf9 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/mate +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/mate @@ -11,5 +11,6 @@ x11-misc/parcellite #in# #?in(os_linux_pkglist, CLDX+)!=# +mate-extra/caja-dropbox x11-themes/mate-icon-theme-faenza #in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/server b/profiles/templates/3.2/6_ac_update_sync/world/create/server index 21e4982..57948a4 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/server +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/server @@ -17,6 +17,10 @@ sys-apps/calculate-server sys-apps/most #in# +#?in(os_linux_pkglist, CLD+)!=# +mail-mta/ssmtp +#in# + #?in(os_linux_pkglist, CDS+)!=# dev-db/mariadb dev-db/mongodb 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 ae94913..15654cc 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 @@ -163,6 +163,7 @@ dev-qt/qt-creator dev-util/android-tools dev-util/geany dev-util/geany-plugins +gnome-base/dconf-editor mail-client/evolution mail-client/mutt mail-client/sylpheed diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/212 b/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/213 similarity index 67% rename from profiles/templates/3.2/6_ac_update_sync/world/update/200-299/212 rename to profiles/templates/3.2/6_ac_update_sync/world/update/200-299/213 index b756ecb..41d8bfe 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/212 +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/213 @@ -1,14 +1,20 @@ -# Calculate format=world name=world ini(overlay-distros.world)<212 +# Calculate format=world name=world ini(overlay-distros.world)<213 -#-ini(overlay-distros.world,212)-# +#-ini(overlay-distros.world,213)-# #?in(os_linux_pkglist, CLDM, CLDX+)!=# mate-extra/caja-extensions mate-extra/mate-user-guide #in# +#?in(os_linux_pkglist, CLD+)!=# +mail-mta/ssmtp +#in# + #?in(os_linux_pkglist, CLDX+)!=# !media-sound/flacon +gnome-base/dconf-editor +mate-extra/caja-dropbox net-im/gajim x11-themes/smplayer-skins x11-themes/smplayer-themes