From f499c169ff4d47cfee84fc4fa72fc70220ae596a Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Tue, 20 Dec 2016 00:17:04 +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=D0=B0=20=D1=80=D0=B5=D0=B2=D0=B8=D0=B7=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=B9=D0=BA=D0=B8=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D1=82=D0=B5=D0=BB=D1=8C=D1=81=D0=BA=D0=B8=D1=85=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B8=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=B2=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B0?= =?UTF-8?q?=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- profiles/templates/3.5/6_ac_update_sync/remerge/0-ini | 2 +- profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161220 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161220 diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini b/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini index c9923f5..03ec65b 100644 --- a/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini +++ b/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini @@ -2,4 +2,4 @@ [overlay-distros] # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system -remerge = 20160101 +remerge = 20160120 diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161220 b/profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161220 new file mode 100644 index 0000000..89440e3 --- /dev/null +++ b/profiles/templates/3.5/6_ac_update_sync/remerge/2016/20161220 @@ -0,0 +1,4 @@ +# Calculate format=samba name=ini.env cl_chroot_status==on&&ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=app-cdr/brasero, app-cdr/k3b, app-cdr/xfburn, app-editors/gedit, app-editors/leafpad, app-editors/pluma, app-office/libreoffice, app-text/qpdfview, app-text/qpdfview, gnome-extra/gnome-calculator, kde-apps/gwenview, kde-apps/kcalc, kde-apps/kmail, kde-apps/konsole, kde-apps/kopete, kde-apps/kwrite, mail-client/claws-mail, mail-client/evolution, mail-client/trojita, mate-extra/mate-calc, media-gfx/eog, media-gfx/eom, media-gfx/gimp, media-gfx/lximage-qt, media-gfx/nomacs, media-sound/clementine, media-sound/rhythmbox, media-video/smplayer, media-video/totem, net-im/gajim, net-im/pidgin, net-im/qutim, net-irc/hexchat, net-irc/konversation, net-irc/kvirc, net-irc/polari, sci-calculators/galculator, www-client/epiphany, www-client/qupzilla, x11-terms/gnome-terminal, x11-terms/mate-terminal, x11-terms/qterminal, x11-terms/xfce4-terminal + +[overlay-calculate] +remerge = #-cl_pass_file-#