[X2Go-Commits] [pyhoca-gui] 01/04: setup.py: replace "MacOS X" with "OS X", add "Darwin" platform support to all Linux branches.

git-admin at x2go.org git-admin at x2go.org
Fri Jan 29 04:14:04 CET 2016


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository pyhoca-gui.

commit b4731527de67a59609f431c6252ae0b981dc1689
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Jan 29 04:08:01 2016 +0100

    setup.py: replace "MacOS X" with "OS X", add "Darwin" platform support to all Linux branches.
---
 debian/changelog |    5 ++++-
 setup.py         |    6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 652b3c7..5e46d83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 pyhoca-gui (0.5.0.6-0x2go1) UNRELEASED; urgency=medium
 
-  * Continue development...
+  [ Mihai Moldovan ]
+  * New upstream version (0.5.0.6):
+    - setup.py: replace "MacOS X" with "OS X", add "Darwin" platform support
+      to all Linux branches.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Thu, 28 Jan 2016 19:04:20 +0100
 
diff --git a/setup.py b/setup.py
index cf68510..6a7703e 100755
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ PROGRAM_NAME = 'PyHoca-GUI'
 # Windows:  UNINSTALL_NAME is for add/remove programs
 UNINSTALL_NAME = 'PyHoca-GUI (A graphical X2Go client)'
 SCRIPT_NAME = 'pyhoca-gui'
-PROGRAM_DESC = '%s is a cross-platform (Windows, MacOS X, Linux) graphical X2Go client.' % PROGRAM_NAME
+PROGRAM_DESC = '%s is a cross-platform (Windows, OS X, Linux) graphical X2Go client.' % PROGRAM_NAME
 PROGRAM_DESC_SHORT = '%s is a graphical X2Go client.' % PROGRAM_NAME
 
 # silence pyflakes with assigning a dummy version here... the real __VERSION__ assignment happens below
@@ -80,7 +80,7 @@ if platform.system() == 'Windows':
     import subprocess
     sys.path.append(os.path.normpath('../pyhoca-contrib/mswin/ms-vc-runtime'))
 
-elif platform.system() == 'Linux':
+elif platform.system() in ('Linux', 'Darwin'):
     import DistUtilsExtra.command.build_extra
     import DistUtilsExtra.command.build_i18n
     import DistUtilsExtra.command.clean_i18n
@@ -293,7 +293,7 @@ if platform.system() == 'Windows':
     )
     cmd_class.update({ 'build_exe': cmd_class['build_with_{freezer}'.format(freezer=default_win32exe_freezer)] })
 
-elif platform.system() == 'Linux':
+elif platform.system() in ('Linux', 'Darwin'):
     cmd_class.update(
         {
             "build" : DistUtilsExtra.command.build_extra.build_extra,

--
Alioth's /srv/git/code.x2go.org/pyhoca-gui.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git


More information about the x2go-commits mailing list