[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated:

X2Go dev team git-admin at x2go.org
Sat Sep 14 15:55:54 CEST 2013

The branch, twofactorauth has been updated
       via  8aa34904dee26049e822203507e2336c6e744cd9 (commit)
      from  636b78c351ac2e627be48765a5847f6ac8915951 (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 -----------------------------------------------------------------

Summary of changes:
 debian/changelog |    3 ++-
 setup.py         |    5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 99fcd1c..c915eb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -85,7 +85,8 @@ pyhoca-gui ( UNRELEASED; urgency=low
     - Provide a separate SetExitHandler function to catch signals from outside.
     - Use Pulseaudio 1.0 for developmental testing.
     - Windows binary: include pulseaudio 1.0 and vcxsrv
-    - Provide code for Windows packaging (py2exe, NSIS) in PyHoca-GUI's setup.py.
+    - Provide code for Windows packaging (py2exe, NSIS) in PyHoca-GUI's
+      setup.py.
   * Depend on Python X2Go
   * Install GNOME icons via dh_links.
   * Install X2Go icons with explicit install paths.
diff --git a/setup.py b/setup.py
index 98ce9b4..462b47e 100755
--- a/setup.py
+++ b/setup.py
@@ -31,12 +31,13 @@ LICENSE = 'GPLv3+'
 AUTHOR = 'Mike Gabriel, Dick Kniep'
 URL = 'http://www.x2go.org'
 LIBRARY_ZIP = r"lib\shardlib.zip"
-NSIS_COMPILE = os.path.join(os.environ['ProgramFiles'], 'NSIS', 'makensis.exe')
-import platform
 from setuptools import setup, find_packages
 from distutils.core import setup
+import platform
 if platform.system() == 'Windows':
+    NSIS_COMPILE = os.path.join(os.environ['ProgramFiles'], 'NSIS', 'makensis.exe')
     from py2exe.build_exe import py2exe
     import os, os.path
     import subprocess

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)).

More information about the x2go-commits mailing list