This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch brokerclient in repository pyhoca-gui. at b53a52c Adapt to new backend concept found in Python X2Go (>= 0.5.0.0). This branch includes the following new commits: new a6ca10b bump version to 0.5.0.0 new b53a52c Adapt to new backend concept found in Python X2Go (>= 0.5.0.0). The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch brokerclient in repository pyhoca-gui. commit a6ca10b530c60515db3700cd285931d5ea6c42f1 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jan 9 10:28:53 2014 +0100 bump version to 0.5.0.0 --- debian/changelog | 6 ++++++ debian/control | 2 +- pyhoca-gui.spec | 4 ++-- pyhoca/wxgui/__init__.py | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6e0577c..090e189 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pyhoca-gui (0.5.0.0-0x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 08 Jan 2014 21:28:37 +0100 + pyhoca-gui (0.4.0.10-0x2go1) UNRELEASED; urgency=low * Continue development... diff --git a/debian/control b/debian/control index 5b9e6d5..d7a9a78 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,7 @@ Architecture: all Depends: ${misc:Depends}, python, - python-x2go (>=0.4.0.9-0~), + python-x2go (>=0.5.0.0-0~), python-argparse, python-notify, python-setproctitle, diff --git a/pyhoca-gui.spec b/pyhoca-gui.spec index 8cf0503..674e25c 100644 --- a/pyhoca-gui.spec +++ b/pyhoca-gui.spec @@ -1,5 +1,5 @@ Name: pyhoca-gui -Version: 0.4.0.10 +Version: 0.5.0.0 Release: 0.0x2go1%{?dist} Summary: Graphical X2Go client written in (wx)Python @@ -15,7 +15,7 @@ BuildRequires: python-distutils-extra BuildRequires: desktop-file-utils BuildRequires: intltool Requires: python-setproctitle -Requires: python-x2go +Requires: python-x2go >= 0.5.0.0 Requires: notify-python Requires: wxPython Requires: python-argparse diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py index 7e33696..a0ea0fa 100644 --- a/pyhoca/wxgui/__init__.py +++ b/pyhoca/wxgui/__init__.py @@ -18,6 +18,6 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.4.0.10' +__VERSION__ = '0.5.0.0' from frontend import * -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch brokerclient in repository pyhoca-gui. commit b53a52c1ae98f66d7f6737f63af17efe5607760b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jan 9 10:50:13 2014 +0100 Adapt to new backend concept found in Python X2Go (>= 0.5.0.0). --- debian/changelog | 2 +- pyhoca-gui | 31 +++++++++---------------------- 2 files changed, 10 insertions(+), 23 deletions(-) diff --git a/debian/changelog b/debian/changelog index 090e189..9f1bbaf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ pyhoca-gui (0.5.0.0-0x2go1) UNRELEASED; urgency=low - * Continue development... + * Adapt to new backend concept found in Python X2Go (>= 0.5.0.0). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 08 Jan 2014 21:28:37 +0100 diff --git a/pyhoca-gui b/pyhoca-gui index ea7da4c..e22fd18 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -105,14 +105,7 @@ from x2go import X2GoLogger as _X2GoLogger from x2go import x2go_cleanup as _x2go_cleanup # X2Go backends -from x2go.defaults import BACKENDS_CONTROLSESSION, BACKEND_CONTROLSESSION_DEFAULT -from x2go.defaults import BACKENDS_TERMINALSESSION, BACKEND_TERMINALSESSION_DEFAULT -from x2go.defaults import BACKENDS_SERVERSESSIONINFO, BACKEND_SERVERSESSIONINFO_DEFAULT -from x2go.defaults import BACKENDS_SERVERSESSIONLIST, BACKEND_SERVERSESSIONLIST_DEFAULT -from x2go.defaults import BACKENDS_PROXY, BACKEND_PROXY_DEFAULT -from x2go.defaults import BACKENDS_SESSIONPROFILES, BACKEND_SESSIONPROFILES_DEFAULT -from x2go.defaults import BACKENDS_CLIENTSETTINGS, BACKEND_CLIENTSETTINGS_DEFAULT -from x2go.defaults import BACKENDS_CLIENTPRINTING, BACKEND_CLIENTPRINTING_DEFAULT +from x2go.defaults import BACKENDS as _BACKENDS from pyhoca.wxgui import __VERSION__ as _version from pyhoca.wxgui import messages @@ -215,15 +208,9 @@ elif _X2GOCLIENT_OS == 'Linux': else: _config_backends = ('FILE') -for _profiles_backend_default in _config_backends: - if BACKENDS_SESSIONPROFILES[_profiles_backend_default] == BACKEND_SESSIONPROFILES_DEFAULT: - break -for _settings_backend_default in _config_backends: - if BACKENDS_CLIENTSETTINGS[_settings_backend_default] == BACKEND_CLIENTSETTINGS_DEFAULT: - break -for _printing_backend_default in _config_backends: - if BACKENDS_CLIENTPRINTING[_printing_backend_default] == BACKEND_CLIENTPRINTING_DEFAULT: - break +_profiles_backend_default = _BACKENDS['X2GoSessionProfiles']['default'] +_settings_backend_default = _BACKENDS['X2GoClientSettings']['default'] +_printing_backend_default = _BACKENDS['X2GoClientPrinting']['default'] # debug options... debug_options = [ @@ -268,11 +255,11 @@ if _X2GOCLIENT_OS == 'Windows': ) backend_options = [ - {'args':['--backend-controlsession'], 'default': None, 'metavar': '<CONTROLSESSION_BACKEND>', 'choices': BACKENDS_CONTROLSESSION.keys(), 'help': 'force usage of a certain CONTROLSESSION_BACKEND (do not use this unless you know exactly what you are doing)', }, - {'args':['--backend-terminalsession'], 'default': None, 'metavar': '<TERMINALSESSION_BACKEND>', 'choices': BACKENDS_TERMINALSESSION.keys(), 'help': 'force usage of a certain TERMINALSESSION_BACKEND (do not use this unless you know exactly what you are doing)', }, - {'args':['--backend-serversessioninfo'], 'default': None, 'metavar': '<SERVERSESSIONINFO_BACKEND>', 'choices': BACKENDS_TERMINALSESSION.keys(), 'help': 'force usage of a certain SERVERSESSIONINFO_BACKEND (do not use this unless you know exactly what you are doing)', }, - {'args':['--backend-serversessionlist'], 'default': None, 'metavar': '<SERVERSESSIONLIST_BACKEND>', 'choices': BACKENDS_TERMINALSESSION.keys(), 'help': 'force usage of a certain SERVERSESSIONLIST_BACKEND (do not use this unless you know exactly what you are doing)', }, - {'args':['--backend-proxy'], 'default': None, 'metavar': '<PROXY_BACKEND>', 'choices': BACKENDS_PROXY.keys(), 'help': 'force usage of a certain PROXY_BACKEND (do not use this unless you know exactly what you are doing)', }, + {'args':['--backend-controlsession'], 'default': None, 'metavar': '<CONTROLSESSION_BACKEND>', 'choices': _BACKENDS['X2GoControlSession'].keys(), 'help': 'force usage of a certain CONTROLSESSION_BACKEND (do not use this unless you know exactly what you are doing)', }, + {'args':['--backend-terminalsession'], 'default': None, 'metavar': '<TERMINALSESSION_BACKEND>', 'choices': _BACKENDS['X2GoTerminalSession'].keys(), 'help': 'force usage of a certain TERMINALSESSION_BACKEND (do not use this unless you know exactly what you are doing)', }, + {'args':['--backend-serversessioninfo'], 'default': None, 'metavar': '<SERVERSESSIONINFO_BACKEND>', 'choices': _BACKENDS['X2GoServerSessionInfo'].keys(), 'help': 'force usage of a certain SERVERSESSIONINFO_BACKEND (do not use this unless you know exactly what you are doing)', }, + {'args':['--backend-serversessionlist'], 'default': None, 'metavar': '<SERVERSESSIONLIST_BACKEND>', 'choices': _BACKENDS['X2GoServerSessionList'].keys(), 'help': 'force usage of a certain SERVERSESSIONLIST_BACKEND (do not use this unless you know exactly what you are doing)', }, + {'args':['--backend-proxy'], 'default': None, 'metavar': '<PROXY_BACKEND>', 'choices': _BACKENDS['X2GoProxy'].keys(), 'help': 'force usage of a certain PROXY_BACKEND (do not use this unless you know exactly what you are doing)', }, {'args':['--backend-sessionprofiles'], 'default': None, 'metavar': '<SESSIONPROFILES_BACKEND>', 'choices': _config_backends, 'help': 'use given backend for accessing session profiles, available backends on your system: %s (default: %s)' % (', '.join(_config_backends), _profiles_backend_default), }, {'args':['--backend-clientsettings'], 'default': None, 'metavar': '<CLIENTSETTINGS_BACKEND>', 'choices': _config_backends, 'help': 'use given backend for accessing the client settings configuration, available backends on your system: %s (default: %s)' % (', '.join(_config_backends), _settings_backend_default), }, {'args':['--backend-clientprinting'], 'default': None, 'metavar': '<CLIENTPRINTING_BACKEND>', 'choices': _config_backends, 'help': 'use given backend for accessing the client printing configuration, available backends on your system: %s (default: %s)' % (', '.join(_config_backends), _printing_backend_default), }, -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
-
git-admin＠x2go.org