Merge branch 'develop' of git.calculate.ru:calculate/overlay into develop

profiles/templates/3.1/2_ac_install_merge/gnome-extra/gnome-screensaver/gnome-screensaver-preferences.desktop

@@ -2,4 +2,4 @@
 
 [Desktop Entry]
 !OnlyShowIn=
-Categories=Settings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;GNOME;GTK;Utility;
+Categories=Settings;DesktopSettings;Security;X-XFCE;

profiles/templates/3.1/6_ac_desktop_profile/2-user/gnome-extra/gnome-screensaver/.calculate/ini.env

@@ -0,0 +1,7 @@
+# Calculate format=samba
+
+[ver]
+gnome-screensaver = 2.30
+
+[update]
+gnome-screensaver = on

profiles/templates/3.1/6_ac_desktop_profile/2-user/gnome-extra/gnome-screensaver/.calculate_directory

@@ -0,0 +1 @@
+# Calculate append=skip merge()!=&&ini(update.gnome-screensaver)!=off&&ini(ver.gnome-screensaver)==&&pkg()>=2.30

profiles/templates/3.1/6_ac_desktop_profile/2-user/gnome-extra/gnome-screensaver/xfce4-keyboard-shortcuts.xml

@@ -0,0 +1,10 @@
+# Calculate pkg(xfce-base/xfce4-session)!= format=xml_xfce path=~/.config/xfce4/xfconf/xfce-perchannel-xml
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-keyboard-shortcuts" version="1.0">
+  <property name="commands" type="empty">
+    <property name="custom" type="empty">
+      <property name="Scroll_Lock" type="string" value="dm-tool lock"/>
+    </property>
+  </property>
+</channel>

profiles/templates/3.1/6_ac_desktop_profile/2-user/gnome-extra/gnome-screensaver/xscreensaver-properties.desktop

@@ -0,0 +1 @@
+# Calculate path=~/.local/share/applications append=remove

profiles/templates/3.1/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml

@@ -4,7 +4,12 @@
 <channel name="xfce4-keyboard-shortcuts" version="1.0">
   <property name="commands" type="empty">
     <property name="default" type="empty">
+#?pkg(gnome-extra/gnome-screensaver)!=&&pkg(x11-misc/lightdm)!=#
       <property name="Scroll_Lock" type="string" value="dm-tool lock"/>
+#pkg#
+#?pkg(gnome-extra/gnome-screensaver)==||pkg(x11-misc/lightdm)==#
+      <property name="Scroll_Lock" type="string" value="xflock4"/>
+#pkg#
       <property name="Print" type="string" value="xfce4-screenshooter -f"/>
       <property name="&lt;Control&gt;&lt;Alt&gt;Delete" type="string" value="xfce4-session-logout"/>
       <property name="&lt;Shift&gt;&lt;Control&gt;&lt;Alt&gt;Delete" type="string" value="xfce4-session-logout --logout"/>

profiles/templates/3.1/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.local/share/applications/xscreensaver-properties.desktop

@@ -1,4 +1,4 @@
-# Calculate format=kde link=/usr/share/applications/xscreensaver-properties.desktop mirror
+# Calculate format=kde link=/usr/share/applications/xscreensaver-properties.desktop pkg(x11-misc/xscreensaver)!= mirror
 [Desktop Entry]
 #добавим в меню
 Name=Screensaver