From 12081ea24009574d0a76f76debe78ddffd82e4f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Mon, 1 Feb 2016 10:13:38 +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=D0=B0=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9?= =?UTF-8?q?=D0=BA=D0=B0=20kmail?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zzz-Desktop/110-Mail/10-kmail/.calculate_directory | 2 +- .../110-Mail/10-kmail/install/.calculate_directory | 2 +- .../zzz-Desktop/110-Mail/10-kmail/install/kmail-4.9.desktop | 2 +- .../zzz-Desktop/110-Mail/10-kmail/uninstall | 2 +- .../3.3/2_ac_install_merge/zzz-Desktop/110-Mail/mimeapps.list | 2 +- profiles/templates/3.3/6_ac_update_sync/remerge/00-ini | 2 +- profiles/templates/3.3/6_ac_update_sync/remerge/96 | 4 ++++ 7 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 profiles/templates/3.3/6_ac_update_sync/remerge/96 diff --git a/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/.calculate_directory b/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/.calculate_directory index 10e44fdb5..9f730db7a 100644 --- a/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/.calculate_directory +++ b/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/.calculate_directory @@ -1,2 +1,2 @@ -# Calculate append=skip merge(kde-base/kmail)!= +# Calculate append=skip merge(kde-apps/kmail)!= diff --git a/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/.calculate_directory b/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/.calculate_directory index 18d698b45..efab385b2 100644 --- a/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/.calculate_directory +++ b/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip pkg(kde-base/kmail)!=&&ini(desktop.mail)==||pkg(kde-base/kmail)!=&&ini(desktop.mail)==kmail +# Calculate append=skip pkg(kde-apps/kmail)!=&&ini(desktop.mail)==||pkg(kde-apps/kmail)!=&&ini(desktop.mail)==kmail diff --git a/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/kmail-4.9.desktop b/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/kmail-4.9.desktop index 62618268a..ffa981002 100644 --- a/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/kmail-4.9.desktop +++ b/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/install/kmail-4.9.desktop @@ -1,4 +1,4 @@ -# Calculate format=kde link=/usr/share/applications/kde4/KMail2.desktop name=calculate-mail.desktop mirror pkg(kde-base/kmail)>=4.9 +# Calculate format=kde link=/usr/share/applications/kde4/KMail2.desktop name=calculate-mail.desktop mirror pkg(kde-apps/kmail)>=4.9 # Hide icon [Desktop Entry] diff --git a/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/uninstall b/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/uninstall index ee92395c2..0eeba7170 100644 --- a/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/uninstall +++ b/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/110-Mail/10-kmail/uninstall @@ -1,4 +1,4 @@ -# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(kde-base/kmail)==&&ini(desktop.mail)==kmail +# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(kde-apps/kmail)==&&ini(desktop.mail)==kmail [desktop] !mail= diff --git a/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/110-Mail/mimeapps.list b/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/110-Mail/mimeapps.list index 676d1e991..c22312f70 100644 --- a/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/110-Mail/mimeapps.list +++ b/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/110-Mail/mimeapps.list @@ -1,4 +1,4 @@ -# Calculate format=compiz protected ini(desktop.mail-removing)==on merge=kde-base/kmail,mail-client/evolution,mail-client/claws-mail +# Calculate format=compiz protected ini(desktop.mail-removing)==on merge=kde-apps/kmail,mail-client/evolution,mail-client/claws-mail #-ini(desktop.mail-removing,)-# 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 d3774d3ff..bfb81a8c4 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 = 94 +remerge = 96 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/96 b/profiles/templates/3.3/6_ac_update_sync/remerge/96 new file mode 100644 index 000000000..d23f125cf --- /dev/null +++ b/profiles/templates/3.3/6_ac_update_sync/remerge/96 @@ -0,0 +1,4 @@ +# Calculate format=samba path=/etc/calculate name=ini.env merge=kde-apps/kmail ini(overlay-calculate.remerge)<96 + +[overlay-calculate] +remerge = 96