The branch, master has been updated via 6618320451923230d75f1e9190dbff9502052b6a (commit) from 36689cb17e965b1d5437e2235aebe639abe17831 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6618320451923230d75f1e9190dbff9502052b6a Author: Orion Poplawski <orion@cora.nwra.com> Date: Thu Dec 20 09:00:39 2012 +0100 Importing all of pyhoca.wxgui in setup.py causes rpmbuild problems due to DISPLAY not being set. It is overkill as well, causing extra dependencies to be installed at build time. (Fixes: #91). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 10 ++++++++++ setup.py | 7 +++++-- x2go/__init__.py | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4e01b79..792320d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +python-x2go (0.2.1.2-0~x2go1) UNRELEASED; urgency=low + + [ Orion Poplawski ] + * New upstream version (0.2.1.2): + - Importing all of pyhoca.wxgui in setup.py causes rpmbuild problems due to + DISPLAY not being set. It is overkill as well, causing extra dependencies + to be installed at build time. (Fixes: #91). + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 20 Dec 2012 08:58:44 +0100 + python-x2go (0.2.1.1-0~x2go1) unstable; urgency=low * New upstream version (0.2.1.1): diff --git a/setup.py b/setup.py index 396dd13..647dbd4 100755 --- a/setup.py +++ b/setup.py @@ -19,11 +19,14 @@ # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. from setuptools import setup, find_packages -import x2go +for line in file(os.path.join('x2go', '__init__.py')).readlines(): + if (line.startswith('__VERSION__')): + exec(line.strip()) +MODULE_VERSION = __VERSION__ setup( name = "x2go", - version = x2go.__VERSION__, + version = MODULE_VERSION, description = "Python X2Go implements an X2Go client/session library in Python based on the Python Paramiko SSH module.", license = 'AGPLv3+', author = 'Mike Gabriel', diff --git a/x2go/__init__.py b/x2go/__init__.py index e8470ef..aefd224 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -178,7 +178,7 @@ Contact """ __NAME__ = 'python-x2go' -__VERSION__ = '0.2.1.1' +__VERSION__ = '0.2.1.2' from gevent import monkey monkey.patch_all() hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).