diff --git a/client-profiles/30-evolution-2.6/.evolution/signatures/default b/client-profiles/30-evolution-2.6/.evolution/signatures/default new file mode 100644 index 0000000..0bf0d57 --- /dev/null +++ b/client-profiles/30-evolution-2.6/.evolution/signatures/default @@ -0,0 +1 @@ +#-ur_signature-# diff --git a/client-profiles/30-evolution-2.6/.gconf/apps/evolution/mail/%gconf.xml b/client-profiles/30-evolution-2.6/.gconf/apps/evolution/mail/%gconf.xml index 4fc83ea..a89cd21 100644 --- a/client-profiles/30-evolution-2.6/.gconf/apps/evolution/mail/%gconf.xml +++ b/client-profiles/30-evolution-2.6/.gconf/apps/evolution/mail/%gconf.xml @@ -4,6 +4,13 @@ #-pop(mtime)-# #-pop(pid)-# #-pop(serial)-# + +
  • + <?xml version="1.0"?> +<signature name="Default" uid="1272518216.11676.0@mhiretskiy" auto="false" format="text/plain"><filename>/home/#-ur_login-#/.evolution/signatures/default</filename></signature> + +
  • +
    #-sum(mtime,mtime)-#.#-sum(pid,pid)-#.#-sum(serial,serial)-#@#-os_net_hostname-# diff --git a/client-profiles/30-gnome-2.6/.config/autostart/fusion-icon-autostart.desktop b/client-profiles/30-gnome-2.6/.config/autostart/fusion-icon-autostart.desktop index 343b95f..a8a9b99 100644 --- a/client-profiles/30-gnome-2.6/.config/autostart/fusion-icon-autostart.desktop +++ b/client-profiles/30-gnome-2.6/.config/autostart/fusion-icon-autostart.desktop @@ -1 +1 @@ -# Calculate format=kde link=/usr/share/applications/fusion-icon.desktop mirror pgk(fusion-icon)!= +# Calculate format=kde link=/usr/share/applications/fusion-icon.desktop mirror pkg(fusion-icon)!= diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/panel/toplevels/top_panel_screen0/background/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/apps/panel/toplevels/top_panel_screen0/background/%gconf.xml index ba4d217..f11ae95 100644 --- a/client-profiles/30-gnome-2.6/.gconf/apps/panel/toplevels/top_panel_screen0/background/%gconf.xml +++ b/client-profiles/30-gnome-2.6/.gconf/apps/panel/toplevels/top_panel_screen0/background/%gconf.xml @@ -1,11 +1,11 @@ # Calculate format=xml_gconf - - - - - - - + + + + + + + diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/background/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/background/%gconf.xml index c1c05ba..642ce2a 100644 --- a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/background/%gconf.xml +++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/background/%gconf.xml @@ -1,10 +1,10 @@ # Calculate format=xml_gconf - + /usr/share/pixmaps/backgrounds/gnome/calculate/#-hr_x11_standart-#.jpg - + stretched diff --git a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/session/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/session/%gconf.xml index 57b9125..663e869 100644 --- a/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/session/%gconf.xml +++ b/client-profiles/30-gnome-2.6/.gconf/desktop/gnome/session/%gconf.xml @@ -1,5 +1,5 @@ # Calculate format=xml_gconf - + diff --git a/client-profiles/80-compiz-0.8.4/.config/autostart/fusion-icon-autostart.desktop b/client-profiles/80-compiz-0.8.4/.config/autostart/fusion-icon-autostart.desktop index 343b95f..a8a9b99 100644 --- a/client-profiles/80-compiz-0.8.4/.config/autostart/fusion-icon-autostart.desktop +++ b/client-profiles/80-compiz-0.8.4/.config/autostart/fusion-icon-autostart.desktop @@ -1 +1 @@ -# Calculate format=kde link=/usr/share/applications/fusion-icon.desktop mirror pgk(fusion-icon)!= +# Calculate format=kde link=/usr/share/applications/fusion-icon.desktop mirror pkg(fusion-icon)!= diff --git a/client-profiles/80-compiz-always/.config/autostart/fusion-icon-autostart.desktop b/client-profiles/80-compiz-always/.config/autostart/fusion-icon-autostart.desktop index 343b95f..a8a9b99 100644 --- a/client-profiles/80-compiz-always/.config/autostart/fusion-icon-autostart.desktop +++ b/client-profiles/80-compiz-always/.config/autostart/fusion-icon-autostart.desktop @@ -1 +1 @@ -# Calculate format=kde link=/usr/share/applications/fusion-icon.desktop mirror pgk(fusion-icon)!= +# Calculate format=kde link=/usr/share/applications/fusion-icon.desktop mirror pkg(fusion-icon)!= diff --git a/pym/cl_client.py b/pym/cl_client.py index f1cdea1..ef97e83 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.17" +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 7c3cd97..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.17'} + cl_ver = {'value':'2.1.18'} # Режим работы клиента клиент # (local или имя хоста клиента) diff --git a/setup.py b/setup.py index 6fed49f..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.17", + version = "2.1.18", description = "Client for the calculate-server", author = "Mir Calculate Ltd.", author_email = "support@calculate.ru",