The branch, master has been updated via 51c52fb1b0d3f94c6cc9c1d42fe5f84674e6026e (commit) from 2037b4b649e534bd8fdae6b4b907963eec0feed2 (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 51c52fb1b0d3f94c6cc9c1d42fe5f84674e6026e Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Dec 20 09:48:28 2012 +0100 Add rules to setup.py that install PyHoca-GUI's data files under Linux (i.e. icons, images, man page, etc.). Thanks to Orion Poplawski for coming up with an inspiring patch. (Fixes: #92). ----------------------------------------------------------------------- Summary of changes: build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo | Bin 541 -> 550 bytes build/mo/da/LC_MESSAGES/PyHoca-GUI.mo | Bin 23577 -> 23792 bytes build/mo/de/LC_MESSAGES/PyHoca-GUI.mo | Bin 25283 -> 25284 bytes build/mo/en/LC_MESSAGES/PyHoca-GUI.mo | Bin 23662 -> 23663 bytes build/mo/es/LC_MESSAGES/PyHoca-GUI.mo | Bin 25344 -> 25359 bytes build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo | Bin 541 -> 546 bytes build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo | Bin 24244 -> 24248 bytes build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo | Bin 23844 -> 23857 bytes build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo | Bin 28871 -> 28873 bytes build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo | Bin 23642 -> 23644 bytes debian/changelog | 4 +- po/PyHoca-GUI.pot | 122 +++++++++++++++--------------- setup.py | 15 ++++ 13 files changed, 79 insertions(+), 62 deletions(-) The diff of changes is: diff --git a/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo index bf0afb2..b5ce7d3 100644 Binary files a/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo index 10b1f79..70fa26d 100644 Binary files a/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo index 8872247..98d92ad 100644 Binary files a/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo index a731337..03de698 100644 Binary files a/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo index a93603c..f704fa2 100644 Binary files a/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo index 2d0340f..231d16f 100644 Binary files a/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo index 1957d79..69cf40f 100644 Binary files a/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo index 2337493..b1a3ab5 100644 Binary files a/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo index e334ec7..bf36286 100644 Binary files a/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo index 2843da1..35f795d 100644 Binary files a/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/debian/changelog b/debian/changelog index 0097fb1..89b80a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,9 @@ pyhoca-gui (0.2.1.2-0~x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * New upstream version (0.2.1.2): - - Continue development... + - Add rules to setup.py that install PyHoca-GUI's data files under Linux + (i.e. icons, images, man page, etc.). Thanks to Orion Poplawski for + coming up with an inspiring patch. (Fixes: #92). * /debian/control: + Thanks to Orion's patch in bug #91 we can drop many build dependencies. diff --git a/po/PyHoca-GUI.pot b/po/PyHoca-GUI.pot index c011b74..fd05fc8 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: 2012-11-26 14:25+0100\n" +"POT-Creation-Date: 2012-12-20 09:07+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" @@ -736,8 +736,8 @@ msgstr "" msgid "Client Options" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783 -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:795 +#: ../pyhoca/wxgui/menus_taskbar.py:987 msgid "E&xit" msgstr "" @@ -890,51 +890,51 @@ msgstr "" msgid "Manage Application Menu" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:714 +#: ../pyhoca/wxgui/menus_taskbar.py:726 msgid "Running" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:716 +#: ../pyhoca/wxgui/menus_taskbar.py:728 msgid "Suspended" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:735 +#: ../pyhoca/wxgui/menus_taskbar.py:747 msgid "&Clean all sessions" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:741 +#: ../pyhoca/wxgui/menus_taskbar.py:753 msgid "Customize &profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:756 +#: ../pyhoca/wxgui/menus_taskbar.py:768 msgid "Shared &folders" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:768 +#: ../pyhoca/wxgui/menus_taskbar.py:780 msgid "&Disconnect from Server" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:775 +#: ../pyhoca/wxgui/menus_taskbar.py:787 msgid "Suspend Session and E&xit application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:779 +#: ../pyhoca/wxgui/menus_taskbar.py:791 msgid "Disconnect and E&xit application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:833 +#: ../pyhoca/wxgui/menus_taskbar.py:845 msgid "Add Profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:909 +#: ../pyhoca/wxgui/menus_taskbar.py:921 msgid "No session profiles defined" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:945 +#: ../pyhoca/wxgui/menus_taskbar.py:957 msgid "Start/Resume Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:945 +#: ../pyhoca/wxgui/menus_taskbar.py:957 msgid "Connect Server" msgstr "" @@ -1012,7 +1012,7 @@ msgstr "" msgid "Unknown session profile, configure before using it..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332 +#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1336 #, python-format msgid "%s - session warning" msgstr "" @@ -1039,26 +1039,26 @@ msgstr "" msgid "New Session Profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1047 +#: ../pyhoca/wxgui/frontend.py:1050 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1056 #, python-format msgid "%s - profile deleted" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1056 msgid "The session profile has been deleted." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1071 +#: ../pyhoca/wxgui/frontend.py:1075 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1224 +#: ../pyhoca/wxgui/frontend.py:1228 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1067,148 +1067,148 @@ msgid "" "Are you sure you want to continue connecting?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1232 +#: ../pyhoca/wxgui/frontend.py:1236 #, python-format msgid "%s: Confirm Host Authorization" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1277 +#: ../pyhoca/wxgui/frontend.py:1281 #, python-format msgid "%s - channel error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1277 +#: ../pyhoca/wxgui/frontend.py:1281 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " "server..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313 -#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351 +#: ../pyhoca/wxgui/frontend.py:1299 ../pyhoca/wxgui/frontend.py:1317 +#: ../pyhoca/wxgui/frontend.py:1319 ../pyhoca/wxgui/frontend.py:1355 #, python-format msgid "%s - session failure" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1295 +#: ../pyhoca/wxgui/frontend.py:1299 msgid "The session startup failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1313 +#: ../pyhoca/wxgui/frontend.py:1317 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1315 +#: ../pyhoca/wxgui/frontend.py:1319 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" "%s." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1332 +#: ../pyhoca/wxgui/frontend.py:1336 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1351 +#: ../pyhoca/wxgui/frontend.py:1355 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2go/SSH server. Session startup failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1370 +#: ../pyhoca/wxgui/frontend.py:1374 #, python-format msgid "%s - audio warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1370 +#: ../pyhoca/wxgui/frontend.py:1374 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1377 ../pyhoca/wxgui/frontend.py:1384 +#: ../pyhoca/wxgui/frontend.py:1381 ../pyhoca/wxgui/frontend.py:1388 #, python-format msgid "%s - audio error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1377 +#: ../pyhoca/wxgui/frontend.py:1381 msgid "The X2Go PulseAudio system could not be started." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1384 +#: ../pyhoca/wxgui/frontend.py:1388 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1396 +#: ../pyhoca/wxgui/frontend.py:1400 #, python-format msgid "%s - audio problem" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1396 +#: ../pyhoca/wxgui/frontend.py:1400 #, python-format msgid "" "The audio connection could not be set up for this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1408 +#: ../pyhoca/wxgui/frontend.py:1412 #, python-format msgid "%s - client-side printing not available" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1408 +#: ../pyhoca/wxgui/frontend.py:1412 #, python-format msgid "" "The server denies client-side printing from within this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1420 +#: ../pyhoca/wxgui/frontend.py:1424 #, python-format msgid "%s - MIME box not available" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1420 +#: ../pyhoca/wxgui/frontend.py:1424 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1432 +#: ../pyhoca/wxgui/frontend.py:1436 #, python-format msgid "%s - client-side folders not sharable" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1432 +#: ../pyhoca/wxgui/frontend.py:1436 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1444 +#: ../pyhoca/wxgui/frontend.py:1448 #, python-format msgid "%s - client resources not sharable" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1444 +#: ../pyhoca/wxgui/frontend.py:1448 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1467 ../pyhoca/wxgui/frontend.py:1469 #, python-format msgid "%s - print error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1463 +#: ../pyhoca/wxgui/frontend.py:1467 #, python-format msgid "" "%s\n" @@ -1216,7 +1216,7 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1469 #, python-format msgid "" "%s\n" @@ -1224,74 +1224,74 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1484 ../pyhoca/wxgui/frontend.py:1499 #, python-format msgid "%s - start" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1480 +#: ../pyhoca/wxgui/frontend.py:1484 #, python-format msgid "" "New X2Go session starting up...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1499 #, python-format msgid "" "Another client started X2Go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525 +#: ../pyhoca/wxgui/frontend.py:1514 ../pyhoca/wxgui/frontend.py:1529 #, python-format msgid "%s - resume" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1514 #, python-format msgid "" "Resuming X2Go session...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1525 +#: ../pyhoca/wxgui/frontend.py:1529 #, python-format msgid "" "Another client resumed X2Go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1540 +#: ../pyhoca/wxgui/frontend.py:1544 #, python-format msgid "%s - running" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1540 +#: ../pyhoca/wxgui/frontend.py:1544 #, python-format msgid "" "Found already running session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1560 +#: ../pyhoca/wxgui/frontend.py:1564 #, python-format msgid "%s - suspend" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1560 +#: ../pyhoca/wxgui/frontend.py:1564 #, python-format msgid "" "X2Go Session has been suspended\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1587 +#: ../pyhoca/wxgui/frontend.py:1591 #, python-format msgid "%s - terminate" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1587 +#: ../pyhoca/wxgui/frontend.py:1591 #, python-format msgid "" "X2Go Session has terminated\n" diff --git a/setup.py b/setup.py index bf21211..9bd2279 100755 --- a/setup.py +++ b/setup.py @@ -172,6 +172,21 @@ elif platform.system() == 'Linux': } ) + icon_files = datafilelist('{prefix}/share/icons/PyHoca'.format(prefix=sys.prefix), r'icons/PyHoca') + img_files = [("{prefix}/share/img".format(prefix=sys.prefix), glob(r'img\\*.*'))] + desktop_files = [ + ('{prefix}/share/applications'.format(prefix=sys.prefix), glob('desktop/*')), + ('{prefix}/share/pixmaps'.format(prefix=sys.prefix), glob('pixmaps/*.svg')), + ] + manpage_files = [ + ('{prefix}/share/man/man1'.format(prefix=sys.prefix), glob('man/man1/*.1')), + ] + data_files.extend(icon_files + + img_files + + desktop_files + + manpage_files + ) + setup( name = PROGRAM_NAME, version = PROGRAM_VERSION, 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)).