Browse Source

Fix patch tempalte version, fix package version, fix chromuim version

master 2.1.18
Mike Hiretsky 12 years ago
parent
commit
66e181ab4c
  1. 2
      client-profiles/01-init/.calculate/ini.env
  2. 2
      client-profiles/80-chromium-5.0/.calculate_directory
  3. 2
      client-profiles/90-patch-2.1.18/.calculate/ini.env
  4. 2
      client-profiles/90-patch-2.1.18/.calculate_directory
  5. 0
      client-profiles/90-patch-2.1.18/.config/xfce4/.calculate_directory
  6. 0
      client-profiles/90-patch-2.1.18/.config/xfce4/helpers.rc
  7. 0
      client-profiles/90-patch-2.1.18/.config/xfce4/panel/launcher-30.rc
  8. 0
      client-profiles/90-patch-2.1.18/.gconf/.calculate_directory
  9. 0
      client-profiles/90-patch-2.1.18/.gconf/apps/panel/objects/300_webbrowser/%gconf.xml
  10. 0
      client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/applications/browser/%gconf.xml
  11. 0
      client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/about/%gconf.xml
  12. 0
      client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml
  13. 0
      client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml
  14. 0
      client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/http/%gconf.xml
  15. 0
      client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/https/%gconf.xml
  16. 0
      client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml
  17. 0
      client-profiles/90-patch-2.1.18/.gnome2/.calculate_directory
  18. 0
      client-profiles/90-patch-2.1.18/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd
  19. 0
      client-profiles/90-patch-2.1.18/.kde4/.calculate_directory
  20. 0
      client-profiles/90-patch-2.1.18/.kde4/share/config/kdeglobals
  21. 0
      client-profiles/90-patch-2.1.18/.kde4/share/config/plasma-desktop-appletsrc
  22. 0
      client-profiles/90-patch-2.1.18/.local/share/applications/defaults.list
  23. 0
      client-profiles/90-patch-2.1.18/.local/share/applications/mimeapps.list
  24. 0
      client-profiles/90-patch-2.1.18/Desktop/README.desktop
  25. 2
      pym/cl_client.py
  26. 2
      pym/cl_vars_client.py
  27. 2
      setup.py

2
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]

2
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

2
client-profiles/90-patch-2.1.19/.calculate/ini.env → 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

2
client-profiles/90-patch-2.1.19/.calculate_directory → 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

0
client-profiles/90-patch-2.1.19/.config/xfce4/.calculate_directory → client-profiles/90-patch-2.1.18/.config/xfce4/.calculate_directory

0
client-profiles/90-patch-2.1.19/.config/xfce4/helpers.rc → client-profiles/90-patch-2.1.18/.config/xfce4/helpers.rc

0
client-profiles/90-patch-2.1.19/.config/xfce4/panel/launcher-30.rc → client-profiles/90-patch-2.1.18/.config/xfce4/panel/launcher-30.rc

0
client-profiles/90-patch-2.1.19/.gconf/.calculate_directory → client-profiles/90-patch-2.1.18/.gconf/.calculate_directory

0
client-profiles/90-patch-2.1.19/.gconf/apps/panel/objects/300_webbrowser/%gconf.xml → client-profiles/90-patch-2.1.18/.gconf/apps/panel/objects/300_webbrowser/%gconf.xml

0
client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/applications/browser/%gconf.xml → client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/applications/browser/%gconf.xml

0
client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/about/%gconf.xml → client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/about/%gconf.xml

0
client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml → client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml

0
client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml → client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml

0
client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/http/%gconf.xml → client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/http/%gconf.xml

0
client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/https/%gconf.xml → client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/https/%gconf.xml

0
client-profiles/90-patch-2.1.19/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml → client-profiles/90-patch-2.1.18/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml

0
client-profiles/90-patch-2.1.19/.gnome2/.calculate_directory → client-profiles/90-patch-2.1.18/.gnome2/.calculate_directory

0
client-profiles/90-patch-2.1.19/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd → client-profiles/90-patch-2.1.18/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd

0
client-profiles/90-patch-2.1.19/.kde4/.calculate_directory → client-profiles/90-patch-2.1.18/.kde4/.calculate_directory

0
client-profiles/90-patch-2.1.19/.kde4/share/config/kdeglobals → client-profiles/90-patch-2.1.18/.kde4/share/config/kdeglobals

0
client-profiles/90-patch-2.1.19/.kde4/share/config/plasma-desktop-appletsrc → client-profiles/90-patch-2.1.18/.kde4/share/config/plasma-desktop-appletsrc

0
client-profiles/90-patch-2.1.19/.local/share/applications/defaults.list → client-profiles/90-patch-2.1.18/.local/share/applications/defaults.list

0
client-profiles/90-patch-2.1.19/.local/share/applications/mimeapps.list → client-profiles/90-patch-2.1.18/.local/share/applications/mimeapps.list

0
client-profiles/90-patch-2.1.19/Desktop/README.desktop → client-profiles/90-patch-2.1.18/Desktop/README.desktop

2
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__])

2
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 или имя хоста клиента)

2
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",

Loading…
Cancel
Save