Changes in new templates user profile.

client-profiles/00-init/.calculate/ini.env

@@ -1,4 +0,0 @@
-# Calculate format=samba
-
-[main]
-update = on

client-profiles/00-new_templates/.calculate/ini.env

@@ -25,3 +25,6 @@ pidgin = on
 vim = on
 mc = on
 firefox = on
+
+[main]
+update = on

client-profiles/01-init/.calculate/ini.env

@@ -0,0 +1,12 @@
+# Calculate format=samba
+
+[main]
+#if profile not clean
+#?exists(~/.kde4)!=||exists(~/.gconf)!=||exists(~/.config)!=#
+update = off
+#exists#
+#if profile is empty
+#?exists(~/.kde4)==&exists(~/.gconf)==&exists(~/.config)==#
+update = on
+#exists#
+

client-profiles/10-kde-always/.calculate_directory

@@ -0,0 +1 @@
+# Calculate ini(main.update)!=off&ini(update.kde)!=off&pkg(kdelibs)>0

client-profiles/10-kde-always/.local/share/applications/mozilla-firefox-3.5.desktop

@@ -0,0 +1,5 @@
+# Calculate format=kde link=/usr/share/applications/mozilla-firefox-3.5.desktop mirror name=mozilla-firefox.desktop
+[Desktop Entry]
+Name=Internet Browser
+Icon=applications-internet
+StartupNotify=false

client-profiles/10-kde-always/.local/share/applications/mozilla-firefox-3.6.desktop

@@ -1,4 +1,4 @@
-# Calculate format=kde link=/usr/share/applications/mozilla-firefox-3.6.desktop mirror
+# Calculate format=kde link=/usr/share/applications/mozilla-firefox-3.6.desktop mirror name=mozilla-firefox.desktop
 [Desktop Entry]
 Name=Internet Browser
 Icon=applications-internet

client-profiles/20-kde-4.3-4.4/.kde4/share/config/plasma-desktop-appletsrc

@@ -212,11 +212,8 @@ geometry=0,0,#-sum(width,width)-#,#-sum(height,height)-#
 !geometry=del
 
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-#?pkg(mozilla-firefox)!=&pkg(mozilla-firefox)<3.6#
-Url=file:///usr/share/applications/mozilla-firefox-3.5.desktop
-#pkg#
-#?pkg(mozilla-firefox)!=&pkg(mozilla-firefox)>=3.6#
-Url=file:///home/#-ur_login-#/.local/share/applications/mozilla-firefox-3.6.desktop
+#?pkg(mozilla-firefox)!=#
+Url=file:///usr/share/applications/mozilla-firefox.desktop
 #pkg#
 #?pkg(mozilla-firefox)==#
 Url=file:///usr/share/applications/kde4/konqbrowser.desktop

client-profiles/20-kde-4.3-4.4/.local/share/applications/gcstar.desktop

@@ -0,0 +1 @@
+# Calculate append=remove

client-profiles/20-kde-4.3/.kde4/share/config/plasma-desktop-appletsrc

@@ -300,11 +300,8 @@ immutability=1
 plugin=icon
 zvalue=0
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-#?pkg(mozilla-firefox)!=&pkg(mozilla-firefox)<3.6#
-Url=file:///usr/share/applications/mozilla-firefox-3.5.desktop
-#pkg#
-#?pkg(mozilla-firefox)!=&pkg(mozilla-firefox)>=3.6#
-Url=file:///home/#-ur_login-#/.local/share/applications/mozilla-firefox-3.6.desktop
+#?pkg(mozilla-firefox)!=#
+Url=file:///usr/share/applications/mozilla-firefox.desktop
 #pkg#
 #?pkg(mozilla-firefox)==#
 Url=file:///usr/share/applications/kde4/konqbrowser.desktop

client-profiles/20-kde-4.4/.kde4/share/config/plasma-desktop-appletsrc

@@ -219,11 +219,8 @@ immutability=1
 plugin=icon
 zvalue=0
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-#?pkg(mozilla-firefox)!=&pkg(mozilla-firefox)<3.6#
-Url=file:///usr/share/applications/mozilla-firefox-3.5.desktop
-#pkg#
-#?pkg(mozilla-firefox)!=&pkg(mozilla-firefox)>=3.6#
-Url=file:///home/#-ur_login-#/.local/share/applications/mozilla-firefox-3.6.desktop
+#?pkg(mozilla-firefox)!=#
+Url=file:///usr/share/applications/mozilla-firefox.desktop
 #pkg#
 #?pkg(mozilla-firefox)==#
 Url=file:///usr/share/applications/kde4/konqbrowser.desktop

client-profiles/20-kde-4.4/.local/share/applications/gcstar.desktop

@@ -1,4 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/gcstar.desktop mirror
-[Desktop Entry]
-#добавим KDE4 диалоги открытия/сохранения файлов
-Exec=kgtk2-wrapper gcstar %f