From a6dcb1c298a2a828d604a73fec10a2f628a0ad9a Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Wed, 18 Nov 2015 00:42:49 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D1=81=D0=BF=D0=B8=D1=81=D0=BE=D0=BA=20=D0=BF=D0=B0?= =?UTF-8?q?=D0=BA=D0=B5=D1=82=D0=BE=D0=B2?= 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 | 2 +- .../6_ac_update_sync/world/update/200-299/{213 => 214} | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) rename profiles/templates/3.2/6_ac_update_sync/world/update/200-299/{213 => 214} (78%) 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 ecacc3a..008e6da 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 = 213 +world = 214 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 3c5fbf9..b769411 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 @@ -4,7 +4,6 @@ mate-base/mate mate-extra/caja-extensions mate-extra/mate-sensors-applet -mate-extra/mate-user-guide net-analyzer/mate-netspeed x11-misc/mate-notification-daemon x11-misc/parcellite @@ -12,5 +11,6 @@ x11-misc/parcellite #?in(os_linux_pkglist, CLDX+)!=# mate-extra/caja-dropbox +mate-extra/mate-user-guide x11-themes/mate-icon-theme-faenza #in# diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/213 b/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/214 similarity index 78% rename from profiles/templates/3.2/6_ac_update_sync/world/update/200-299/213 rename to profiles/templates/3.2/6_ac_update_sync/world/update/200-299/214 index 41d8bfe..b0239c8 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/213 +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/200-299/214 @@ -1,10 +1,13 @@ -# Calculate format=world name=world ini(overlay-distros.world)<213 +# Calculate format=world name=world ini(overlay-distros.world)<214 -#-ini(overlay-distros.world,213)-# +#-ini(overlay-distros.world,214)-# + +#?in(os_linux_pkglist, CLDM)!=# +!mate-extra/mate-user-guide +#in# #?in(os_linux_pkglist, CLDM, CLDX+)!=# mate-extra/caja-extensions -mate-extra/mate-user-guide #in# #?in(os_linux_pkglist, CLD+)!=# @@ -15,6 +18,7 @@ mail-mta/ssmtp !media-sound/flacon gnome-base/dconf-editor mate-extra/caja-dropbox +mate-extra/mate-user-guide net-im/gajim x11-themes/smplayer-skins x11-themes/smplayer-themes