diff --git a/profiles/templates/3.3/2_ac_install_merge/x11-libs/pango/.calculate_directory b/profiles/templates/3.3/2_ac_install_merge/x11-libs/pango/.calculate_directory new file mode 100644 index 000000000..ef8e23132 --- /dev/null +++ b/profiles/templates/3.3/2_ac_install_merge/x11-libs/pango/.calculate_directory @@ -0,0 +1,2 @@ +# Calculate merge()!=&&pkg()>=1.36.8 path=/etc name=pango + diff --git a/profiles/templates/3.3/2_ac_install_merge/x11-libs/pango/pango.modules b/profiles/templates/3.3/2_ac_install_merge/x11-libs/pango/pango.modules new file mode 100644 index 000000000..8afb1e88b --- /dev/null +++ b/profiles/templates/3.3/2_ac_install_merge/x11-libs/pango/pango.modules @@ -0,0 +1 @@ +# Calculate append=remove diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini b/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini index 24c8053b9..4d9535160 100644 --- a/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini +++ b/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini @@ -2,4 +2,4 @@ [overlay-calculate] # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system -remerge = 35 +remerge = 36 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/36 b/profiles/templates/3.3/6_ac_update_sync/remerge/36 new file mode 100644 index 000000000..747e7841c --- /dev/null +++ b/profiles/templates/3.3/6_ac_update_sync/remerge/36 @@ -0,0 +1,4 @@ +# Calculate format=samba path=/etc/calculate name=ini.env merge=x11-libs/pango ini(overlay-calculate.remerge)<36 + +[overlay-calculate] +remerge = 36