The branch, twofactorauth has been updated via 680b47ea9696f72210798e7a0143f43c81880a7c (commit) from 2862512dd52f00914717874f22c413ab06550cd2 (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 | 8 +++++ po/pyhoca-gui.pot | 34 +++++++++---------- pyhoca/wxgui/__init__.py | 2 +- setup.cfg | 6 ---- setup.cfg_disabled | 6 ---- setup_py2exe.py | 81 ---------------------------------------------- 6 files changed, 26 insertions(+), 111 deletions(-) delete mode 100644 setup.cfg delete mode 100644 setup.cfg_disabled delete mode 100644 setup_py2exe.py The diff of changes is: diff --git a/debian/changelog b/debian/changelog index efa9a94..190bb4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +pyhoca-gui (0.0.25-0~nwt1) lucid maverick testing unstable; urgency=low + + * fixed profile manager for Windows + * layout change on profile manager's session tab + * added i18n support to Windows version + + -- Mike Gabriel <m.gabriel@das-netzwerkteam.de> Mon, 17 Jan 2011 00:15:00 +0100 + pyhoca-gui (0.0.24-0~nwt1) lucid maverick testing unstable; urgency=low * fixed profile manager window for Windows (and KDE4) diff --git a/po/pyhoca-gui.pot b/po/pyhoca-gui.pot index 5c7ad79..668847f 100644 --- a/po/pyhoca-gui.pot +++ b/po/pyhoca-gui.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-14 04:08+0100\n" +"POT-Creation-Date: 2011-01-16 23:33+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -436,66 +436,66 @@ msgstr "" msgid "PyHoca-GUI Profile Manager - %s" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:607 +#: ../pyhoca/wxgui/profilemanager.py:608 msgid "Session Profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:608 +#: ../pyhoca/wxgui/profilemanager.py:609 msgid "Connection" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:609 +#: ../pyhoca/wxgui/profilemanager.py:610 msgid "Settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:610 +#: ../pyhoca/wxgui/profilemanager.py:611 msgid "Sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:973 +#: ../pyhoca/wxgui/profilemanager.py:974 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:976 +#: ../pyhoca/wxgui/profilemanager.py:977 msgid "Choose an icon for this session profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1084 +#: ../pyhoca/wxgui/profilemanager.py:1085 msgid "All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1086 -#: ../pyhoca/wxgui/profilemanager.py:1101 +#: ../pyhoca/wxgui/profilemanager.py:1087 +#: ../pyhoca/wxgui/profilemanager.py:1102 msgid "Choose a public SSH key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1224 +#: ../pyhoca/wxgui/profilemanager.py:1225 msgid "Choose a folder to share within a session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1289 ../pyhoca/wxgui/menus_taskbar.py:86 +#: ../pyhoca/wxgui/profilemanager.py:1290 ../pyhoca/wxgui/menus_taskbar.py:86 msgid "Profile Manager" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1289 +#: ../pyhoca/wxgui/profilemanager.py:1290 msgid "Profile name is missing, profile unusable!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1309 +#: ../pyhoca/wxgui/profilemanager.py:1310 #, python-format msgid "%s - profile added" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1310 +#: ../pyhoca/wxgui/profilemanager.py:1311 msgid "A new session profile has been added." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1314 +#: ../pyhoca/wxgui/profilemanager.py:1315 #, python-format msgid "%s - modified" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1315 +#: ../pyhoca/wxgui/profilemanager.py:1316 msgid "Changes to profile have been saved." msgstr "" diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py index 3e525df..43bf89e 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.0.24' +__VERSION__ = '0.0.25' from frontend import * diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index d58552f..0000000 --- a/setup.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[build] -i18n = True - -[build_i18n] -domain = pyhoca-gui -#desktop_files = [('share/applications', ['desktop/pyhoca-gui.desktop.in', ]), ] diff --git a/setup.cfg_disabled b/setup.cfg_disabled deleted file mode 100644 index 725e6d9..0000000 --- a/setup.cfg_disabled +++ /dev/null @@ -1,6 +0,0 @@ -#[build] -#i18n = True - -#[build_i18n] -#domain = pyhoca-gui -#desktop_files = [('share/applications', ['desktop/pyhoca-gui.desktop.in', ]), ] diff --git a/setup_py2exe.py b/setup_py2exe.py deleted file mode 100644 index cbd1ac0..0000000 --- a/setup_py2exe.py +++ /dev/null @@ -1,81 +0,0 @@ -#!/usr/bin/python - -# Copyright (C) 2010-2011 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> -# -# PyHoca is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# PyHoca is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -# -# run on Windows with: ,,python setup_py2exe.py py2exe -p greenlet'' -# - -import gevent.monkey -gevent.monkey.patch_all() - -from distutils.core import setup -from glob import glob -import py2exe - -""" -installs manifest and icon into the .exe -but icon is still needed as we open it -for the window icon (not just the .exe) -changelog and logo are included in dist -""" - -try: - # building from trunk - dll_data_files = [("Microsoft.VC90.CRT", glob(r'..\\..\\contrib\\ms-vc-runtime\\*.*'))] - nxproxy_files = [("nxproxy", glob(r'..\\..\\contrib\\nxproxy-mswin\\nxproxy-3.0.4-2\\*.*'))] - pulseaudio_files = [("pulseaudio", glob(r'..\\..\\contrib\\pulseaudio-mswin\\pulseaudio-0.9.6\\*.*'))] -except: - # building from tag - dll_data_files = [("Microsoft.VC90.CRT", glob(r'..\\..\\..\\..\\contrib\\ms-vc-runtime\\*.*'))] - nxproxy_files = [("nxproxy", glob(r'..\\..\\..\\..\\contrib\\nxproxy-mswin\\nxproxy-3.0.4-2\\*.*'))] - pulseaudio_files = [("pulseaudio", glob(r'..\\..\\..\\..\\contrib\\pulseaudio-mswin\\pulseaudio-0.9.6\\*.*'))] - -icon_files = [ - ("icons\\PyHoca\\16x16", glob(r'icons\\PyHoca\\16x16\\*.*')), - ("icons\\PyHoca\\22x22", glob(r'icons\\PyHoca\\22x22\\*.*')), - ("icons\\PyHoca\\32x32", glob(r'icons\\PyHoca\\32x32\\pyhoca-*.*')), - ("icons\\PyHoca\\32x32", glob(r'icons\\PyHoca\\32x32\\x2go*.*')), - ("icons\\PyHoca\\48x48", glob(r'icons\\PyHoca\\48x48\\*.*')), - ("icons\\PyHoca\\64x64", glob(r'icons\\PyHoca\\64x64\\*.*')), - ("icons\\PyHoca\\128x128", glob(r'icons\\PyHoca\\128x128\\*.*')), - ("icons", glob(r'pixmaps\\*.ico')), - ] -img_files = [("img", glob(r'img\\*.*'))] - -setup( - windows = [ - { - "script": "pyhoca-gui", - "icon_resources": [(0, "pixmaps/pyhoca_x2go-logo-ubuntu.ico")], - } - ], - data_files=[ - "pixmaps/pyhoca-gui.ico", - ] + - dll_data_files + - icon_files + - img_files + - nxproxy_files, - options={ - 'py2exe': { - 'dll_excludes': ['MSVCP90.DLL'], - } - } -) - 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)).