From b7ba47d2d9f3659f304ffc44c2756b5dc956c332 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Wed, 16 Dec 2015 00:07:34 +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=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA?= =?UTF-8?q?=D0=B0=20qterminal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../30-mate-terminal/install/mate-terminal-1.8.desktop | 2 +- .../900-Terminal/50-qterminal/.calculate_directory | 2 ++ .../900-Terminal/50-qterminal/install/.calculate_directory | 1 + .../900-Terminal/50-qterminal/install/mimeapps.list | 7 +++++++ .../900-Terminal/50-qterminal/install/qterminal.desktop | 6 ++++++ .../zzz-Desktop/900-Terminal/50-qterminal/uninstall | 5 +++++ .../zzz-Desktop/900-Terminal/mimeapps.list | 2 +- profiles/templates/3.3/6_ac_update_sync/remerge/00-ini | 2 +- profiles/templates/3.3/6_ac_update_sync/remerge/85 | 4 ++++ 9 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/.calculate_directory create mode 100644 profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/.calculate_directory create mode 100644 profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/mimeapps.list create mode 100644 profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/qterminal.desktop create mode 100644 profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/uninstall create mode 100644 profiles/templates/3.3/6_ac_update_sync/remerge/85 diff --git a/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/mate-terminal-1.8.desktop b/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/mate-terminal-1.8.desktop index 156fc39a9..a23efc404 100644 --- a/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/mate-terminal-1.8.desktop +++ b/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/900-Terminal/30-mate-terminal/install/mate-terminal-1.8.desktop @@ -1,4 +1,4 @@ -# Calculate format=kde link=/usr/share/applications/urxvt-mate-terminal.desktop name=calculate-terminal.desktop mirror pkg(x11-terms/mate-terminal)>=1.8 +# Calculate format=kde link=/usr/share/applications/mate-terminal.desktop name=calculate-terminal.desktop mirror pkg(x11-terms/mate-terminal)>=1.8 # Hide icon [Desktop Entry] diff --git a/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/.calculate_directory b/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/.calculate_directory new file mode 100644 index 000000000..29bf3b70a --- /dev/null +++ b/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/.calculate_directory @@ -0,0 +1,2 @@ +# Calculate append=skip merge(x11-terms/qterminal)!= + diff --git a/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/.calculate_directory b/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/.calculate_directory new file mode 100644 index 000000000..e39b06fcd --- /dev/null +++ b/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/.calculate_directory @@ -0,0 +1 @@ +# Calculate append=skip pkg(x11-terms/qterminal)!=&&ini(desktop.terminal)==||pkg(x11-terms/qterminal)!=&&ini(desktop.terminal)==qterminal diff --git a/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/mimeapps.list b/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/mimeapps.list new file mode 100644 index 000000000..b736d3009 --- /dev/null +++ b/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/mimeapps.list @@ -0,0 +1,7 @@ +# Calculate format=compiz protected + +# Update info +#-ini(desktop.updating, on)-# +#-ini(desktop.terminal, qterminal)-# + +[Added Associations] diff --git a/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/qterminal.desktop b/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/qterminal.desktop new file mode 100644 index 000000000..4041e49ac --- /dev/null +++ b/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/install/qterminal.desktop @@ -0,0 +1,6 @@ +# Calculate format=kde link=/usr/share/applications/qterminal.desktop name=calculate-terminal.desktop mirror pkg(x11-terms/qterminal)>=0.6 + +# Hide icon +[Desktop Entry] +NoDisplay=true +!MimeType= diff --git a/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/uninstall b/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/uninstall new file mode 100644 index 000000000..07ed5cd2d --- /dev/null +++ b/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/900-Terminal/50-qterminal/uninstall @@ -0,0 +1,5 @@ +# Calculate format=samba path=/etc/calculate name=ini.env ac_install_unmerge==on&&pkg(x11-terms/qterminal)==&&ini(desktop.terminal)==qterminal + +[desktop] +!terminal= +terminal-removing=on diff --git a/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/900-Terminal/mimeapps.list b/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/900-Terminal/mimeapps.list index 397a16087..6674e7488 100644 --- a/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/900-Terminal/mimeapps.list +++ b/profiles/templates/3.3/2_ac_install_merge/zzz-Desktop/900-Terminal/mimeapps.list @@ -1,4 +1,4 @@ -# Calculate format=compiz protected ini(desktop.terminal-removing)==on merge=kde-apps/konsole,x11-terms/gnome-terminal,x11-terms/mate-terminal,x11-terms/xfce4-terminal,x11-terms/rxvt-unicode +# Calculate format=compiz protected ini(desktop.terminal-removing)==on merge=kde-apps/konsole,x11-terms/gnome-terminal,x11-terms/mate-terminal,x11-terms/xfce4-terminal,x11-terms/qterminal #-ini(desktop.terminal-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 5523860a9..8ba1f7ca1 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 = 84 +remerge = 85 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/85 b/profiles/templates/3.3/6_ac_update_sync/remerge/85 new file mode 100644 index 000000000..9955f8b2d --- /dev/null +++ b/profiles/templates/3.3/6_ac_update_sync/remerge/85 @@ -0,0 +1,4 @@ +# Calculate format=samba path=/etc/calculate name=ini.env merge=x11-terms/mate-terminal ini(overlay-calculate.remerge)<85 + +[overlay-calculate] +remerge = 85