[X2go-Commits] pyhoca-cli.git - master (branch) updated: 0.2.1.0-4-g98e1f92

[X2Go dev team]

The branch, master has been updated
       via  98e1f92241ec398173f140f0f7ccd6baa604a316 (commit)
       via  a13a51e90ea824cf730c66e5c3b4fe24ece82b5b (commit)
      from  7f734774dd333ea3f917e811c05970013556ab69 (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 98e1f92241ec398173f140f0f7ccd6baa604a316
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Dec 20 09:06:37 2012 +0100

    add os import to setup.py

commit a13a51e90ea824cf730c66e5c3b4fe24ece82b5b
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu Dec 20 08:57:12 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 |    5 ++++-
 setup.py         |   10 ++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 24d58c7..0e4001e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
 pyhoca-cli (0.2.1.1-0~x2go1) UNRELEASED; urgency=low
 
+  [ Orion Poplawski ]
   * New upstream version (0.2.1.1):
-    - Continue development...
+    - 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, 13 Dec 2012 13:33:33 +0100
 
diff --git a/setup.py b/setup.py
index 548553a..234babb 100755
--- a/setup.py
+++ b/setup.py
@@ -18,12 +18,18 @@
 # Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
+import os
+
 from setuptools import setup, find_packages
-import pyhoca.cli
+
+for line in file(os.path.join('pyhoca', 'cli', '__init__.py')).readlines():
+    if (line.startswith('__VERSION__')):
+        exec(line.strip())
+PROGRAM_VERSION = __VERSION__
 
 setup(
     name = "PyHoca-CLI",
-    version = pyhoca.cli.__VERSION__,
+    version = PROGRAM_VERSION,
     description = "PyHoca-CLI is a cross-platform (Windows, MacOS X, Linux) X2Go client for the command line.",
     license = 'AGPLv3+',
     author = 'Mike Gabriel',


hooks/post-receive
-- 
pyhoca-cli.git (Python X2Go Client (command line client))

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-cli.git" (Python X2Go Client (command line client)).