Method cl_client.removeDir moved to the library modules

Modified algorithm create user profile

README

@@ -7,7 +7,7 @@ calculate-client needs the following library version installed, in order to run:
     Python >= 2.5
     python-ldap >= 2.0.0
     pyxml >= 0.8
-    calculate-lib >= 2.1.4
+    calculate-lib >= 2.2.0
 
 To install calculate-client , just execute the install script 'setup.py'.
 Example:

client-profiles/10-base-kde4.2/.calculate_directory

@@ -1,2 +0,0 @@
-# Calculate os_linux_shortname==CLD&cl_pass_step==first&pkg(kdelibs)>=4.2.1&pkg(kdelibs)<4.3
-

client-profiles/10-base-kde4.3/.calculate_directory

@@ -1,2 +0,0 @@
-# Calculate os_linux_shortname==CLD&cl_pass_step==first&pkg(kdelibs)>=4.3&pkg(kdelibs)<4.4
-

client-profiles/20-clean-default/.calculate_directory

@@ -1 +0,0 @@
-# Calculate cl_pass_step!=first&load(ver,/home/#-ur_login-#/.zzz-calculate.kde)<4.3&pkg(kdelibs)>=4.3

client-profiles/40-old-CLD/.calculate_directory

@@ -1 +0,0 @@
-# Calculate os_linux_shortname==CLD&cl_pass_step==first

client-profiles/50-default-CLD/.calculate_directory

@@ -1 +0,0 @@
-# Calculate os_linux_shortname==CLD&cl_pass_step==first

client-profiles/50-default-CLDX/.calculate_directory

@@ -1 +0,0 @@
-# Calculate os_linux_shortname==CLDX&cl_pass_step==first

client-profiles/60-default-desktop/.calculate_directory

@@ -1,2 +0,0 @@
-# Calculate cl_pass_step==first
-

client-profiles/70-update-CLD09.9/.calculate_directory

@@ -1 +0,0 @@
-# Calculate cl_pass_step==first&pkg(kdelibs)>=4.3.1||cl_pass_step!=first&load(ver,/home/#-ur_login-#/.zzz-calculate.kde)<4.3.1&pkg(kdelibs)>=4.3.1

client-profiles/70-update-CLD10.0/.calculate_directory

@@ -1 +0,0 @@
-# Calculate cl_pass_step==first&pkg(kdelibs)>=4.3.3||cl_pass_step!=first&load(ver,/home/#-ur_login-#/.zzz-calculate.kde)<4.3.3&pkg(kdelibs)>=4.3.3

client-profiles/70-update-CLDX09.9/.calculate_directory

@@ -1 +0,0 @@
-# Calculate cl_pass_step==first&os_linux_ver>=9.9&os_linux_shortname==CLDX||os_linux_shortname==CLDX&load(ver,/home/#-ur_login-#/.zzz-calculate.xfce)<9.9

client-profiles/70-update-CLDX10.0/.calculate_directory

@@ -1 +0,0 @@
-# Calculate cl_pass_step==first&os_linux_ver>=10.0&os_linux_shortname==CLDX||os_linux_shortname==CLDX&load(ver,/home/#-ur_login-#/.zzz-calculate.xfce)<10.0

client-profiles/80-update-CLDX/.calculate_directory

@@ -1 +0,0 @@
-# Calculate os_linux_shortname==CLDX

client-profiles/90-default-zzz/.calculate_directory

@@ -1 +0,0 @@
-# Calculate cl_pass_step==first

client-templates/.calculate_directory

@@ -0,0 +1 @@
+# Calculate name=#-ur_login-# path=/home chown=#-ur_login-#:#-ur_group-# chmod=0700

client-templates/10-base-kde4.2/.calculate_directory

@@ -0,0 +1,2 @@
+# Calculate append=skip  os_linux_shortname==CLD&&cl_pass_step==first&&pkg(kdelibs)>=4.2.1&&pkg(kdelibs)<4.3
+

client-templates/10-base-kde4.3/.calculate_directory

@@ -0,0 +1,2 @@
+# Calculate append=skip os_linux_shortname==CLD&&cl_pass_step==first&&pkg(kdelibs)>=4.3&&pkg(kdelibs)<4.4
+

client-templates/20-clean-default/.calculate_directory

@@ -0,0 +1 @@
+# Calculate append=skip cl_pass_step!=first&&load(ver,/home/#-ur_login-#/.zzz-calculate.kde)<4.3&&pkg(kdelibs)>=4.3

client-templates/40-old-CLD/.calculate_directory

@@ -0,0 +1 @@
+# Calculate append=skip os_linux_shortname==CLD&&cl_pass_step==first

client-templates/40-old-CLD/.kde4/share/config/kdeglobals

@@ -1,4 +1,4 @@
-# Calculate format=kde pkg(kdelibs)>=4.2&pkg(kdelibs)<4.3
+# Calculate format=kde pkg(kdelibs)>=4.2&&pkg(kdelibs)<4.3
 [Emoticons]
 #тема смайликов
 emoticonsTheme=KMess-Cartoon

client-templates/40-old-CLD/.kde4/share/config/plasma-appletsrc

@@ -1,4 +1,4 @@
-# Calculate format=plasma pkg(kdelibs)>=4.2&pkg(kdelibs)<4.3
+# Calculate format=plasma pkg(kdelibs)>=4.2&&pkg(kdelibs)<4.3
 #------------------------------------------------------------------------------
 #рабочий стол
 #------------------------------------------------------------------------------
@@ -66,7 +66,7 @@ zvalue=0
 Url=file:///home/#-ur_login-#/Disks
 #cl_remote_host#
 
-#?cl_remote_host!=&cl_remote_ftp!=#
+#?cl_remote_host!=&&cl_remote_ftp!=#
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
 geometry=#-sum(ix,ix+icox+stepx)-#,#-sum(iy,cornery+stepy)-#,#-sum(icox,icox)-#,#-sum(icoy,icoy)-#
 immutability=1
@@ -175,7 +175,7 @@ zvalue=0
 Url=file:///home/#-ur_login-#/Disks
 #cl_remote_host#
 
-#?cl_remote_host!=&cl_remote_ftp!=#
+#?cl_remote_host!=&&cl_remote_ftp!=#
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
 geometry=#-sum(x,x+sp)-#,0,#-sum(x,bs,x+bs)-#,#-sum(bs,bs)-#
 immutability=1

client-templates/40-old-CLD/.kde4/share/config/plasmarc

@@ -1,4 +1,4 @@
-# Calculate format=plasma pkg(kdelibs)>=4.2&pkg(kdelibs)<4.3
+# Calculate format=plasma pkg(kdelibs)>=4.2&&pkg(kdelibs)<4.3
 #нижняя панель
 [PlasmaViews][1]
 Alignment=132

client-templates/50-default-CLD/.calculate_directory

@@ -0,0 +1 @@
+# Calculate append=skip os_linux_shortname==CLD&&cl_pass_step==first

client-templates/50-default-CLD/.config/autostart/kopete.desktop

@@ -1,2 +1,2 @@
-# Calculate format=kde link=/usr/share/applications/kde4/kopete.desktop mirror cl_remote_host!=&sr_jabber_host!=
+# Calculate format=kde link=/usr/share/applications/kde4/kopete.desktop mirror cl_remote_host!=&&sr_jabber_host!=
 #добавим Kopete в автозагрузку если настроен локальный Jabber сервер