Перенос шаблонов, использующих переменную разрешения, из merge в live

9 years ago · 0b793ab21c
parent c88ff01287
commit 0b793ab21c
34 changed files with 2 additions and 1 deletions
--- a/profiles/templates/3.3/2_ac_install_merge/mate-base/mate-desktop/.calculate_directory
+++ b/profiles/templates/3.3/2_ac_install_merge/mate-base/mate-desktop/.calculate_directory
@ -1 +0,0 @@
-# Calculate append=skip merge()!=&&pkg()!=
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/mate-base/.calculate_directory
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/mate-base/.calculate_directory
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/mate-base/mate-desktop/.calculate_directory
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/mate-base/mate-desktop/.calculate_directory
@ -0,0 +1 @@
+# Calculate append=skip merge()!=&&pkg()!=&&os_install_x11_resolution!=
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/mate-base/mate-desktop/glib-compile-schemas
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/mate-base/mate-desktop/glib-compile-schemas
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/mate-base/mate-desktop/org.mate.background.gschema.xml
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/mate-base/mate-desktop/org.mate.background.gschema.xml
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/.calculate_directory
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/.calculate_directory
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.xml
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate.xml
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/.calculate_directory
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/.calculate_directory
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/calculate/Calculate
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.xml
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/mate.xml
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/.calculate_directory
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/.calculate_directory
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate
--- a/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate
+++ b/profiles/templates/3.3/3_ac_install_live/1-merge/media-gfx/calculate-wallpapers/xfce/Calculate
--- a/profiles/templates/3.3/3_ac_install_live/Depends/dm-themes-calculate
+++ b/profiles/templates/3.3/3_ac_install_live/Depends/dm-themes-calculate
@ -0,0 +1 @@
+# Calculate append=skip merge(media-gfx/dm-themes-calculate)!= merge=mate-base/mate-desktop
--- a/profiles/templates/3.3/2_ac_install_merge/Depends/gnome-backgrounds
+++ b/profiles/templates/3.3/2_ac_install_merge/Depends/gnome-backgrounds
--- a/profiles/templates/3.3/2_ac_install_merge/Depends/mate-session-manager
+++ b/profiles/templates/3.3/2_ac_install_merge/Depends/mate-session-manager
--- a/profiles/templates/3.3/2_ac_install_merge/Depends/xfdesktop
+++ b/profiles/templates/3.3/2_ac_install_merge/Depends/xfdesktop
				`@ -0,0 +1 @@`
				`# Calculate append=skip merge()!=&&pkg()!=&&os_install_x11_resolution!=`
				`@ -0,0 +1 @@`
				`# Calculate append=skip merge(media-gfx/dm-themes-calculate)!= merge=mate-base/mate-desktop`