diff --git a/client-profiles/01-init/.calculate/ini.env b/client-profiles/01-init/.calculate/ini.env index b98d3c8..4bb551a 100644 --- a/client-profiles/01-init/.calculate/ini.env +++ b/client-profiles/01-init/.calculate/ini.env @@ -14,7 +14,7 @@ ver = #-os_linux_ver-# #?exists(~/.kde4)==&exists(~/.gconf)==&exists(~/.config)==# [ver] -patch = 2.1.19 +patch = 2.1.18 #exists# [update] diff --git a/client-profiles/80-chromium-5.0/.calculate_directory b/client-profiles/80-chromium-5.0/.calculate_directory index 4a011ac..195172c 100644 --- a/client-profiles/80-chromium-5.0/.calculate_directory +++ b/client-profiles/80-chromium-5.0/.calculate_directory @@ -1 +1 @@ -# Calculate ini(main.update)!=off&ini(update.chromium)!=off&ini(ver.chromium)==&pkg(www-client/chromium)>=5.0 +# Calculate exists(~/.config/chromium)==&ini(main.update)!=off&ini(update.chromium)!=off&ini(ver.chromium)==&pkg(www-client/chromium)>=5.0 diff --git a/client-profiles/90-patch-2.1.19/.calculate/ini.env b/client-profiles/90-patch-2.1.18/.calculate/ini.env similarity index 77% rename from client-profiles/90-patch-2.1.19/.calculate/ini.env rename to client-profiles/90-patch-2.1.18/.calculate/ini.env index 00cc998..9f70b1b 100644 --- a/client-profiles/90-patch-2.1.19/.calculate/ini.env +++ b/client-profiles/90-patch-2.1.18/.calculate/ini.env @@ -1,7 +1,7 @@ # Calculate format=samba [ver] -patch = 2.1.19 +patch = 2.1.18 [update] patch = on diff --git a/client-profiles/90-patch-2.1.19/.calculate_directory b/client-profiles/90-patch-2.1.18/.calculate_directory similarity index 81% rename from client-profiles/90-patch-2.1.19/.calculate_directory rename to client-profiles/90-patch-2.1.18/.calculate_directory index f492b18..f4e7016 100644 --- a/client-profiles/90-patch-2.1.19/.calculate_directory +++ b/client-profiles/90-patch-2.1.18/.calculate_directory @@ -1 +1 @@ -# Calculate ini(main.update)!=off&ini(update.patch)!=off&ini(ver.patch)<2.1.19 +# Calculate ini(main.update)!=off&ini(update.patch)!=off&ini(ver.patch)<2.1.18 diff --git a/client-profiles/90-patch-2.1.19/.config/xfce4/.calculate_directory b/client-profiles/90-patch-2.1.18/.config/xfce4/.calculate_directory similarity index 100% rename from client-profiles/90-patch-2.1.19/.config/xfce4/.calculate_directory rename to client-profiles/90-patch-2.1.18/.config/xfce4/.calculate_directory diff --git a/client-profiles/90-patch-2.1.19/.config/xfce4/helpers.rc b/client-profiles/90-patch-2.1.18/.config/xfce4/helpers.rc similarity index 100% rename from client-profiles/90-patch-2.1.19/.config/xfce4/helpers.rc rename to client-profiles/90-patch-2.1.18/.config/xfce4/helpers.rc diff --git a/client-profiles/90-patch-2.1.19/.config/xfce4/panel/launcher-30.rc b/client-profiles/90-patch-2.1.18/.config/xfce4/panel/launcher-30.rc similarity index 100% rename from client-profiles/90-patch-2.1.19/.config/xfce4/panel/launcher-30.rc rename to client-profiles/90-patch-2.1.18/.config/xfce4/panel/launcher-30.rc diff --git a/client-profiles/90-patch-2.1.19/.gconf/.calculate_directory b/client-profiles/90-patch-2.1.18/.gconf/.calculate_directory similarity index 100% rename from client-profiles/90-patch-2.1.19/.gconf/.calculate_directory rename to client-profiles/90-patch-2.1.18/.gconf/.calculate_directory diff --git a/client-profiles/90-patch-2.1.19/.gconf/apps/panel/objects/300_webbrowser/%gconf.xml b/client-profiles/90-patch-2.1.18/.gconf/apps/panel/objects/300_webbrowser/%gconf.xml similarity index 100% rename from client-profiles/90-patch-2.1.19/.gconf/apps/panel/objects/300_webbrowser/%gconf.xml rename to client-profiles/90-patch-2.1.18/.gconf/apps/panel/objects/300_webbrowser/%gconf.xml diff --git a/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/applications/browser/%gconf.xml b/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/applications/browser/%gconf.xml similarity index 100% rename from client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/applications/browser/%gconf.xml rename to client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/applications/browser/%gconf.xml diff --git a/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/about/%gconf.xml b/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/about/%gconf.xml similarity index 100% rename from client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/about/%gconf.xml rename to client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/about/%gconf.xml diff --git a/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml b/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml similarity index 100% rename from client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml rename to client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml diff --git a/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml b/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml similarity index 100% rename from client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml rename to client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml diff --git a/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/http/%gconf.xml b/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/http/%gconf.xml similarity index 100% rename from client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/http/%gconf.xml rename to client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/http/%gconf.xml diff --git a/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/https/%gconf.xml b/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/https/%gconf.xml similarity index 100% rename from client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/https/%gconf.xml rename to client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/https/%gconf.xml diff --git a/client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml b/client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml similarity index 100% rename from client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml rename to client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml diff --git a/client-profiles/90-patch-2.1.19/.gnome2/.calculate_directory b/client-profiles/90-patch-2.1.18/.gnome2/.calculate_directory similarity index 100% rename from client-profiles/90-patch-2.1.19/.gnome2/.calculate_directory rename to client-profiles/90-patch-2.1.18/.gnome2/.calculate_directory diff --git a/client-profiles/90-patch-2.1.19/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd b/client-profiles/90-patch-2.1.18/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd similarity index 100% rename from client-profiles/90-patch-2.1.19/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd rename to client-profiles/90-patch-2.1.18/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd diff --git a/client-profiles/90-patch-2.1.19/.kde4/.calculate_directory b/client-profiles/90-patch-2.1.18/.kde4/.calculate_directory similarity index 100% rename from client-profiles/90-patch-2.1.19/.kde4/.calculate_directory rename to client-profiles/90-patch-2.1.18/.kde4/.calculate_directory diff --git a/client-profiles/90-patch-2.1.19/.kde4/share/config/kdeglobals b/client-profiles/90-patch-2.1.18/.kde4/share/config/kdeglobals similarity index 100% rename from client-profiles/90-patch-2.1.19/.kde4/share/config/kdeglobals rename to client-profiles/90-patch-2.1.18/.kde4/share/config/kdeglobals diff --git a/client-profiles/90-patch-2.1.19/.kde4/share/config/plasma-desktop-appletsrc b/client-profiles/90-patch-2.1.18/.kde4/share/config/plasma-desktop-appletsrc similarity index 100% rename from client-profiles/90-patch-2.1.19/.kde4/share/config/plasma-desktop-appletsrc rename to client-profiles/90-patch-2.1.18/.kde4/share/config/plasma-desktop-appletsrc diff --git a/client-profiles/90-patch-2.1.19/.local/share/applications/defaults.list b/client-profiles/90-patch-2.1.18/.local/share/applications/defaults.list similarity index 100% rename from client-profiles/90-patch-2.1.19/.local/share/applications/defaults.list rename to client-profiles/90-patch-2.1.18/.local/share/applications/defaults.list diff --git a/client-profiles/90-patch-2.1.19/.local/share/applications/mimeapps.list b/client-profiles/90-patch-2.1.18/.local/share/applications/mimeapps.list similarity index 100% rename from client-profiles/90-patch-2.1.19/.local/share/applications/mimeapps.list rename to client-profiles/90-patch-2.1.18/.local/share/applications/mimeapps.list diff --git a/client-profiles/90-patch-2.1.19/Desktop/README.desktop b/client-profiles/90-patch-2.1.18/Desktop/README.desktop similarity index 100% rename from client-profiles/90-patch-2.1.19/Desktop/README.desktop rename to client-profiles/90-patch-2.1.18/Desktop/README.desktop diff --git a/pym/cl_client.py b/pym/cl_client.py index 91e1fe9..bc51c7e 100644 --- a/pym/cl_client.py +++ b/pym/cl_client.py @@ -35,7 +35,7 @@ import subprocess from encrypt import encrypt from signal import SIGTERM -Version = "calculate-client 2.1.19" +Version = "calculate-client 2.1.18" tr = cl_base.lang() tr.setLanguage(sys.modules[__name__]) diff --git a/pym/cl_vars_client.py b/pym/cl_vars_client.py index 11210d5..beb5cb4 100644 --- a/pym/cl_vars_client.py +++ b/pym/cl_vars_client.py @@ -138,7 +138,7 @@ class Data: cl_name = {'value':'calculate-client'} # версия программы - cl_ver = {'value':'2.1.19'} + cl_ver = {'value':'2.1.18'} # Режим работы клиента клиент # (local или имя хоста клиента) diff --git a/setup.py b/setup.py index d1f6dbb..d1e2cb7 100755 --- a/setup.py +++ b/setup.py @@ -102,7 +102,7 @@ class cl_install_data(install_data): setup( name = 'calculate-client', - version = "2.1.19", + version = "2.1.18", description = "Client for the calculate-server", author = "Mir Calculate Ltd.", author_email = "support@calculate.ru",