From cca4df9f0bdf7e6053f14df567df4f400d5e4092 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: Wed, 25 Nov 2020 09:35:44 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D1=8B=20?= =?UTF-8?q?=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8=20gnome-?= =?UTF-8?q?base/nautilus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- merge/README.txt | 2 ++ merge/gnome-base/nautilus/.calculate_directory | 1 - merge/gnome-base/nautilus/nautilus-autostart.desktop | 4 ---- merge/gnome-base/nautilus/nautilus.desktop | 4 ---- 4 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 merge/gnome-base/nautilus/.calculate_directory delete mode 100644 merge/gnome-base/nautilus/nautilus-autostart.desktop delete mode 100644 merge/gnome-base/nautilus/nautilus.desktop diff --git a/merge/README.txt b/merge/README.txt index f8dc806..ae0bd85 100644 --- a/merge/README.txt +++ b/merge/README.txt @@ -7,6 +7,8 @@ app-portage/porthole Удалены шаблоны app-portage/layman, так как они содержат устаревшие правки +Удалены шаблоны gnome-base/nautilus, так как настраиваемые файлы на которые он +ссылкает уже отсутствуют. При переносе шаблонов app-office/libreoffice удалены шаблоны для x86 При переносе шаблонов app-portage/eix удалены условия и шаблоны для версии diff --git a/merge/gnome-base/nautilus/.calculate_directory b/merge/gnome-base/nautilus/.calculate_directory deleted file mode 100644 index 1fc381b..0000000 --- a/merge/gnome-base/nautilus/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -{% calculate path='/etc/xdg', name='autostart', pkg() >= '3.4' %} diff --git a/merge/gnome-base/nautilus/nautilus-autostart.desktop b/merge/gnome-base/nautilus/nautilus-autostart.desktop deleted file mode 100644 index 198a909..0000000 --- a/merge/gnome-base/nautilus/nautilus-autostart.desktop +++ /dev/null @@ -1,4 +0,0 @@ -{% calculate format='kde' %} - -[Desktop Entry] -AutostartCondition=GNOME3 if-session gnome diff --git a/merge/gnome-base/nautilus/nautilus.desktop b/merge/gnome-base/nautilus/nautilus.desktop deleted file mode 100644 index 8175b7b..0000000 --- a/merge/gnome-base/nautilus/nautilus.desktop +++ /dev/null @@ -1,4 +0,0 @@ -{% calculate format='kde', path='/usr/share/applications', pkg('gnome-extra/nemo') %} - -[Desktop Entry] -NoDisplay=true