From 4d3c872b0b35bd345fc4c71ea258a9adc3615f4a Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Sun, 5 Apr 2015 20:52:01 +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?= 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/printer | 1 - .../templates/3.2/6_ac_update_sync/world/update/{32 => 35} | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) rename profiles/templates/3.2/6_ac_update_sync/world/update/{32 => 35} (81%) 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 d69a55b..9708790 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 = 34 +world = 35 diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/printer b/profiles/templates/3.2/6_ac_update_sync/world/create/printer index 1cd75ae..675f373 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/create/printer +++ b/profiles/templates/3.2/6_ac_update_sync/world/create/printer @@ -1,7 +1,6 @@ # Calculate name=world format=world #?in(os_linux_pkglist, CLD, CLDX)!=# -net-print/cndrvcups-lb net-print/cnijfilter net-print/cups net-print/gutenprint diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/32 b/profiles/templates/3.2/6_ac_update_sync/world/update/35 similarity index 81% rename from profiles/templates/3.2/6_ac_update_sync/world/update/32 rename to profiles/templates/3.2/6_ac_update_sync/world/update/35 index 1bd0ac0..9f16302 100644 --- a/profiles/templates/3.2/6_ac_update_sync/world/update/32 +++ b/profiles/templates/3.2/6_ac_update_sync/world/update/35 @@ -1,6 +1,6 @@ -# Calculate format=world name=world ini(overlay-distros.world)<32 +# Calculate format=world name=world ini(overlay-distros.world)<35 -#-ini(overlay-distros.world,32)-# +#-ini(overlay-distros.world,35)-# #?in(os_linux_pkglist, CLD, CLDX)!=# !net-print/cndrvcups-capt