[X2go-Commits] pyhoca-gui.git - master (branch) updated: 0.2.1.1-1-g04f5e0f

[X2Go dev team]

The branch, master has been updated
       via  04f5e0f727bb0886dd28c868419ea4dfdbd491f0 (commit)
      from  074593a51c7470bc814a6b87b7bb81b26021014e (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 04f5e0f727bb0886dd28c868419ea4dfdbd491f0
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu Dec 20 08:54:20 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 ++++++++++
 pyhoca/wxgui/__init__.py |    2 +-
 setup.py                 |    6 ++++--
 3 files changed, 15 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index c042ddf..eb90add 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+pyhoca-gui (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 at das-netzwerkteam.de>  Thu, 20 Dec 2012 08:51:50 +0100
+
 pyhoca-gui (0.2.1.1-0~x2go1) unstable; urgency=low
 
   * New upstream version (0.2.1.1):
diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py
index 467b22e..7f1a55b 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.2.1.1'
+__VERSION__ = '0.2.1.2'
 
 from frontend import *
diff --git a/setup.py b/setup.py
index 59db907..6198238 100755
--- a/setup.py
+++ b/setup.py
@@ -21,11 +21,13 @@
 # import the PyHoca-GUI
 import sys
 import os
-import pyhoca.wxgui
 
 PROGRAM_NAME = 'PyHoca-GUI'
 PROGRAM_DESC = '%s is a cross-platform (Windows, MacOS X, Linux) graphical X2Go client.' % PROGRAM_NAME
-PROGRAM_VERSION = pyhoca.wxgui.__VERSION__
+for line in file(os.path.join('pyhoca', 'wxgui', '__init__.py')).readlines():
+    if (line.startswith('__VERSION__')):
+        exec(line.strip())
++PROGRAM_VERSION = __VERSION__
 PROGRAM_ICON = "pixmaps/pyhoca_x2go-logo-ubuntu.ico"
 LICENSE = 'AGPLv3+'
 AUTHOR = 'Mike Gabriel, Dick Kniep'


hooks/post-receive
-- 
pyhoca-gui.git (Python X2Go Client (wxPython GUI))

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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).