Изменение шаблонов связанных с media-gfx/dm-themes-calculate

profiles/templates/3.1/2_ac_install_merge/Depends/dm-themes-calculate

@@ -1 +1 @@
-# Calculate append=skip merge(media-gfx/dm-themes-calculate)!= merge=gnome-base/gconf,gnome-base/gdm,kde-base/kdm,lxde-base/lxdm
+# Calculate append=skip merge(media-gfx/dm-themes-calculate)!= merge=gnome-base/gconf,gnome-base/gdm,kde-base/kdm,lxde-base/lxdm,x11-themes/gnome-themes-standard,media-gfx/gdm-themes-calculate,gnome-extra/gnome-screensaver,media-gfx/kdm-themes-calculate,x11-misc/lightdm-gtk-greeter

profiles/templates/3.1/2_ac_install_merge/gnome-base/gconf/%gconf-tree.xml

@@ -14,8 +14,11 @@
 #?pkg(media-gfx/dm-themes-calculate)==&&pkg(media-gfx/cldg-themes)>=12.0_alpha1#
 								<stringvalue>/usr/share/pixmaps/calculate-gdm-#-os_x11_standart-#.jpg</stringvalue>
 #pkg#
-#?pkg(media-gfx/dm-themes-calculate)!=#
+#?pkg(media-gfx/dm-themes-calculate)>=14-r1#
-								<stringvalue>/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg</stringvalue>
+								<stringvalue>/usr/share/wallpapers/Calculate-dm/contents/images/#-os_x11_standart-#.jpg</stringvalue>
+#pkg#
+#?pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1#
+                                                                <stringvalue>/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg</stringvalue>
 #pkg#
 							</default>
 							<longdesc>File to use for the background image.</longdesc>

profiles/templates/3.1/2_ac_install_merge/gnome-base/gdm/10-calculate-settings

@@ -13,7 +13,10 @@ picture-uri='file:///usr/share/pixmaps/calculate-gdm.jpg'
 #?pkg(media-gfx/dm-themes-calculate)==&&pkg(media-gfx/cldg-themes)>=12.0_alpha1#
 picture-uri='file:///usr/share/pixmaps/calculate-gdm-#-os_x11_standart-#.jpg'
 #pkg#
-#?pkg(media-gfx/dm-themes-calculate)!=#
+#?pkg(media-gfx/dm-themes-calculate)>=14-r1#
+picture-uri='file:///usr/share/wallpapers/Calculate-dm/contents/images/#-os_x11_standart-#.jpg'
+#pkg#
+#?pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1#
 picture-uri='file:///usr/share/wallpapers/dm-#-os_x11_standart-#.jpg'
 #pkg#
 picture-options='stretched'

profiles/templates/3.1/2_ac_install_merge/kde-base/kdm/backgroundrc

@@ -15,7 +15,10 @@ Pattern=fish
 Program=
 ReverseBlending=false
 UseSHM=false
-#?pkg(media-gfx/dm-themes-calculate)!=#
+#?pkg(media-gfx/dm-themes-calculate)>=14-r1#
+Wallpaper=/usr/share/wallpapers/Calculate-dm/contents/images/#-os_x11_standart-#.jpg
+#pkg#
+#?pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1#
 Wallpaper=/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg
 #pkg#
 WallpaperList=Custom

profiles/templates/3.1/2_ac_install_merge/lxde-base/lxdm/lxdm.conf

@@ -41,7 +41,10 @@ bg=/usr/share/lxdm/themes/Calculate/bg.jpg
 #?pkg(media-gfx/dm-themes-calculate)==&&pkg(media-gfx/cldx-themes)>=12.0_alpha1#
 bg=/usr/share/lxdm/themes/Calculate/calculate-lxdm-#-os_x11_standart-#.jpg
 #pkg#
-#?pkg(media-gfx/dm-themes-calculate)!=#
+#?pkg(media-gfx/dm-themes-calculate)>=14-r1#
+bg=/usr/share/wallpapers/Calculate-dm/contents/images/#-os_x11_standart-#.jpg
+#pkg#
+#?pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1#
 bg=/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg
 #pkg#
 

profiles/templates/3.1/2_ac_install_merge/media-gfx/gdm-themes-calculate/background.png

@@ -1 +1 @@
-# Calculate link=/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg symbolic
+# Calculate pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1 link=/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg symbolic

profiles/templates/3.1/2_ac_install_merge/media-gfx/gdm-themes-calculate/background.png.14-r1

@@ -0,0 +1 @@
+# Calculate name=background.png pkg(media-gfx/dm-themes-calculate)>=14-r1 link=/usr/share/wallpapers/Calculate-dm/contents/images/#-os_x11_standart-#.jpg symbolic

profiles/templates/3.1/2_ac_install_merge/x11-themes/gnome-themes-standard/adwaita-timed.xml

@@ -1,6 +1,11 @@
 # Calculate append=replace pkg(x11-themes/gnome-themes-standard)>=3.8 path=/usr/share/themes/Adwaita/backgrounds
 <background>
 <static>
+#?pkg(media-gfx/dm-themes-calculate)>=14-r1#
+<file>/usr/share/wallpapers/Calculate-dm/contents/images/#-os_x11_standart-#.jpg</file>
+#pkg#
+#?pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1#
 <file>/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg</file>
+#pkg#
 </static>
 </background>

profiles/templates/3.1/3_ac_install_live/1-live/gnome-extra/gnome-screensaver/%gconf-tree.xml

@@ -6,7 +6,7 @@
 \s*&lt;dir name="keyboard"&gt;)</reg>
 <text>\1\2&lt;dir name="background"&gt;
 \2        &lt;entry name="picture_filename" type="string"&gt;
-\2                 &lt;stringvalue&gt;/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg&lt;/stringvalue&gt;
+\2                 &lt;stringvalue&gt;/usr/share/wallpapers/#?pkg(media-gfx/dm-themes-calculate)>=14-r1#Calculate-dm/contents/images/#pkg##?pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1#dm-#pkg##-os_x11_standart-#.jpg&lt;/stringvalue&gt;
 \2        &lt;/entry&gt;
 \2&lt;/dir&gt;
 \2\3</text>

profiles/templates/3.1/3_ac_install_live/1-live/media-gfx/kdm-themes-calculate/bg.jpg

@@ -1 +1 @@
-# Calculate link=/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg mirror
+# Calculate pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1 link=/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg mirror

profiles/templates/3.1/3_ac_install_live/1-live/media-gfx/kdm-themes-calculate/bg.jpg.14-r1

@@ -0,0 +1 @@
+# Calculate name=bg.jpg pkg(media-gfx/dm-themes-calculate)>=14-r1 link=/usr/share/wallpapers/Calculate-dm/contents/images/#-os_x11_standart-#.jpg mirror

profiles/templates/3.1/4_ac_desktop_merge/install/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter.conf

@@ -1,7 +1,10 @@
 # Calculate format=kde path=/etc/lightdm
 
 [greeter]
-#?pkg(media-gfx/dm-themes-calculate)!=#
+#?pkg(media-gfx/dm-themes-calculate)>=14-r1#
+background=/usr/share/wallpapers/Calculate-dm/contents/images/#-os_x11_standart-#.jpg
+#pkg#
+#?pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1#
 background=/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg
 #pkg#
 logo=/usr/share/wallpapers/calculate-logo.png

profiles/templates/3.1/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.10/plasma-overlay-appletsrc

@@ -31,7 +31,12 @@ timezone=Local
 slideTimer=10
 slidepaths=/usr/share/wallpapers/
 userswallpapers=
+#?pkg(media-gfx/dm-themes-calculate)>=14-r1#
+wallpaper=/usr/share/wallpapers/Calculate-dm/contents/images/#-os_x11_standart-#.jpg
+#pkg#
+#?pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1#
 wallpaper=/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg
+#pkg#
 wallpapercolor=0,0,0
 wallpaperposition=0
 

profiles/templates/3.1/6_ac_desktop_profile/2-user/kde-base/plasma-workspace-4.9-4.10/plasma-overlay-appletsrc

@@ -31,7 +31,12 @@ timezone=Local
 slideTimer=10
 slidepaths=/usr/share/wallpapers/
 userswallpapers=
+#?pkg(media-gfx/dm-themes-calculate)>=14-r1#
+wallpaper=/usr/share/wallpapers/Calculate-dm/contents/images/#-os_x11_standart-#.jpg
+#pkg#
+#?pkg(media-gfx/dm-themes-calculate)!=&&pkg(media-gfx/dm-themes-calculate)<14-r1#
 wallpaper=/usr/share/wallpapers/dm-#-os_x11_standart-#.jpg
+#pkg#
 wallpapercolor=0,0,0
 wallpaperposition=0