x2go-commits February 2012

x2go-commits@lists.x2go.org

1 participants
198 discussions

x2goclient.git - master (branch) updated: 3.99.1.0-4-g4a93130
by git-admin＠x2go.org 22 Feb '12

22 Feb '12

The branch, master has been updated via 4a931302e089e07c9d9f01ca263c1c682ce00974 (commit) via a783ba67041653511cff25031dc9c81995225e66 (commit) from c56b99a96b23d2978231b5d3a892b658a727e363 (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 4a931302e089e07c9d9f01ca263c1c682ce00974 Author: Daniel Lindgren <bd.dali(a)gmail.com> Date: Wed Feb 22 21:21:56 2012 +0100 Update/improve Swedish translation after testing x2goclient on Windows. commit a783ba67041653511cff25031dc9c81995225e66 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 22 21:20:19 2012 +0100 Update copyright year in about window. Including all translations. ----------------------------------------------------------------------- Summary of changes: configdialog.cpp | 2 +- debian/changelog | 8 ++++++++ onmainwindow_part3.cpp | 2 +- x2goclient_de.ts | 4 ++-- x2goclient_en.ts | 2 +- x2goclient_fr.ts | 2 +- x2goclient_nb_no.ts | 4 ++-- x2goclient_ru.ts | 4 ++-- x2goclient_sv.ts | 39 ++++++++++++++++++++------------------- x2goclient_zh_tw.ts | 2 +- 10 files changed, 39 insertions(+), 30 deletions(-) The diff of changes is: diff --git a/configdialog.cpp b/configdialog.cpp index 6dad751..e8e2a43 100644 --- a/configdialog.cpp +++ b/configdialog.cpp @@ -4,7 +4,7 @@ // Description: // // -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2006-2011 +// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2006-2012 // // Copyright: See COPYING file that comes with this distribution // diff --git a/debian/changelog b/debian/changelog index ceeed80..e3e0b5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,14 @@ x2goclient (3.99.1.1-0~x2go1) UNRELEASED; urgency=low [ Oleksandr Shneyder ] * New upstream version (3.99.1.1): - not including <netinet/in.h> on Q_OS_WIN platform. + + [ Mike Gabriel ] + * New upstream version (3.99.1.1): + - Update copyright year in about window. Including all translations. + + [ Daniel Lindgren ] + * New upstream version (3.99.1.1): + - Update/improve Swedish translation after testing x2goclient on Windows. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 Feb 2012 15:11:58 +0100 diff --git a/onmainwindow_part3.cpp b/onmainwindow_part3.cpp index a2ff1e6..a2e4b07 100644 --- a/onmainwindow_part3.cpp +++ b/onmainwindow_part3.cpp @@ -1520,7 +1520,7 @@ void ONMainWindow::slotSupport() void ONMainWindow::slotAbout() { QString aboutStr=tr ( - " (C. 2006-2011 obviously nice: " + " (C. 2006-2012 obviously nice: " "Oleksandr Shneyder, Heinz-Markus Graesing) " ); if ( embedMode ) aboutStr+=tr ( " x2goplugin mode was sponsored by " diff --git a/x2goclient_de.ts b/x2goclient_de.ts index 09baf25..157a4f2 100644 --- a/x2goclient_de.ts +++ b/x2goclient_de.ts @@ -1415,8 +1415,8 @@ sound system connections through firewalls</source> </message> <message> <location filename="onmainwindow_part3.cpp" line="1522"/> - <source> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> - <translation> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> + <source> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> + <translation> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="1588"/> diff --git a/x2goclient_en.ts b/x2goclient_en.ts index ff3ab11..1dfa80c 100644 --- a/x2goclient_en.ts +++ b/x2goclient_en.ts @@ -1364,7 +1364,7 @@ Unsaved documents will be lost</source> </message> <message> <location filename="onmainwindow_part3.cpp" line="1522"/> - <source> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> + <source> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> <translation type="unfinished"></translation> </message> <message> diff --git a/x2goclient_fr.ts b/x2goclient_fr.ts index 02cf546..78387f4 100644 --- a/x2goclient_fr.ts +++ b/x2goclient_fr.ts @@ -1358,7 +1358,7 @@ Unsaved documents will be lost</source> </message> <message> <location filename="onmainwindow_part3.cpp" line="1522"/> - <source> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> + <source> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> <translation type="unfinished"></translation> </message> <message> diff --git a/x2goclient_nb_no.ts b/x2goclient_nb_no.ts index f541e95..d14dbcf 100644 --- a/x2goclient_nb_no.ts +++ b/x2goclient_nb_no.ts @@ -1057,8 +1057,8 @@ </message> <message> <location filename="onmainwindow_part3.cpp" line="1522"/> - <source> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> - <translation> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> + <source> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> + <translation> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="1588"/> diff --git a/x2goclient_ru.ts b/x2goclient_ru.ts index 3bc79f4..ba0ed9b 100644 --- a/x2goclient_ru.ts +++ b/x2goclient_ru.ts @@ -1604,8 +1604,8 @@ Public key hash: </source> </message> <message> <location filename="onmainwindow_part3.cpp" line="1522"/> - <source> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> - <translation> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> + <source> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> + <translation> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> </message> <message> <source>Can't read host rsa key:</source> diff --git a/x2goclient_sv.ts b/x2goclient_sv.ts index 94fcf10..32025c8 100644 --- a/x2goclient_sv.ts +++ b/x2goclient_sv.ts @@ -165,7 +165,7 @@ <message> <location filename="contest.cpp" line="150"/> <source>Socket operation timed out</source> - <translatorcomment>Hittade ingen bra översättning för socket</translatorcomment> + <translatorcomment>Couldn't find a good translation for socket</translatorcomment> <translation>Socketoperation överskred tidsgräns</translation> </message> <message> @@ -479,7 +479,7 @@ <message> <location filename="editconnectiondialog.cpp" line="109"/> <source>Session preferences - </source> - <translation>Sessionspreferenser - </translation> + <translation>Sessionsinställningar - </translation> </message> </context> <context> @@ -497,8 +497,7 @@ <message> <location filename="exportdialog.cpp" line="45"/> <source>&Preferences ...</source> - <translatorcomment>Kanske skulle "Egna inställningar" vara bättre.</translatorcomment> - <translation>&Preferenser...</translation> + <translation>&Inställningar...</translation> </message> <message> <location filename="exportdialog.cpp" line="46"/> @@ -527,13 +526,13 @@ <message> <location filename="httpbrokerclient.cpp" line="178"/> <source>us</source> - <translatorcomment>Språkkod för svenska i X.org</translatorcomment> + <translatorcomment>Swedish keyboard layout</translatorcomment> <translation>se</translation> </message> <message> <location filename="httpbrokerclient.cpp" line="181"/> <source>pc105/us</source> - <translatorcomment>Svenskt tangentbord</translatorcomment> + <translatorcomment>Swedish keyboard model</translatorcomment> <translation>pc105/se</translation> </message> <message> @@ -786,6 +785,7 @@ <message> <location filename="onmainwindow.cpp" line="673"/> <source>Session management...</source> + <translatorcomment>Added Alt shortcut, same letter as Ctrl shortcut (like &New session...)</translatorcomment> <translation>S&essionshantering...</translation> </message> <message> @@ -973,7 +973,7 @@ Använd dolt läge?</translation> <message> <location filename="onmainwindow.cpp" line="1905"/> <source>X2Go Link to session </source> - <translation>X2Go Länk till session</translation> + <translation>Länk till X2Go-session</translation> </message> <message> <location filename="onmainwindow.cpp" line="1955"/> @@ -1096,7 +1096,7 @@ Publik nyckel: </translation> <message> <location filename="onmainwindow_part2.cpp" line="417"/> <source>unknown</source> - <translation>okänd</translation> + <translation>okänt</translation> </message> <message> <location filename="onmainwindow_part2.cpp" line="482"/> @@ -1183,13 +1183,13 @@ Publik nyckel: </translation> <message> <location filename="onmainwindow_part2.cpp" line="1170"/> <source>24 or 32</source> - <translation>24- eller 32-</translation> + <translation>24 eller 32</translation> </message> <message> <location filename="onmainwindow_part2.cpp" line="1171"/> <location filename="onmainwindow_part2.cpp" line="1191"/> <source> bit and restart your X-server before you reconnect to this x2go-session. Resume this session anyway?</source> - <translation>bitar och startar om X-servern innan du återansluter till denna X2Go-session. Återanslut session ändå?</translation> + <translation> bitar och startar om X-servern innan du återansluter till denna X2Go-session. Återanslut session ändå?</translation> </message> <message> <location filename="onmainwindow_part2.cpp" line="1258"/> @@ -1381,8 +1381,8 @@ Data som ej sparats kommer att förloras</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="1522"/> - <source> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> - <translation> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> + <source> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> + <translation> (&copy; 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="1526"/> @@ -1503,7 +1503,7 @@ Uppdatera till en nyare version av x2goserver</translation> <message> <location filename="onmainwindow_part4.cpp" line="1658"/> <source>Keyboard layout:</source> - <translatorcomment>Verkar vara vanligt förekommande "svengelskt" ord</translatorcomment> + <translatorcomment>Swenglish, but commonly used.</translatorcomment> <translation>Tangentbordslayout:</translation> </message> <message> @@ -1740,7 +1740,7 @@ du kan installera sshd med (Debian/Ubuntu) <message> <location filename="printwidget.cpp" line="53"/> <source>Please configure your client side printing settings. If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghost… and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a… can find further information <a href="http://www.x2go.org/index.php?id=49">here</a>.</source> - <translation>Konfigurera utskriftsinställningar för klienten. Om du vill skriva ut den skapade filen så behöver du en extern applikation. Du kan oftast använda <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghost… och<a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a… information finns <a href="http://www.x2go.org/index.php?id=49">här</a>.</translation> + <translation>Konfigurera utskriftsinställningar för klienten. Om du vill skriva ut den skapade filen så behöver du en extern applikation. Du kan oftast använda <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghost… och <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a… information finns <a href="http://www.x2go.org/index.php?id=49">här</a>.</translation> </message> </context> <context> @@ -1824,7 +1824,7 @@ Example: <message> <location filename="sessionbutton.cpp" line="116"/> <source>Session preferences...</source> - <translation>Sessionspreferenser...</translation> + <translation>Sessionsinställningar...</translation> </message> <message> <location filename="sessionbutton.cpp" line="120"/> @@ -1937,7 +1937,7 @@ Example: <message> <location filename="sessionmanagedialog.cpp" line="35"/> <source>E&xit</source> - <translation>&Avsluta</translation> + <translation>&Avbryt</translation> </message> <message> <location filename="sessionmanagedialog.cpp" line="41"/> @@ -1947,7 +1947,8 @@ Example: <message> <location filename="sessionmanagedialog.cpp" line="42"/> <source>&Session preferences</source> - <translation>&Sessionspreferenser</translation> + <translatorcomment>There are "..." on every other button so why not here ...</translatorcomment> + <translation>&Sessionsinställningar...</translation> </message> <message> <location filename="sessionmanagedialog.cpp" line="43"/> @@ -1981,7 +1982,7 @@ Example: <message> <location filename="sessionwidget.cpp" line="57"/> <source><< change icon</source> - <translation><< ändra ikon</translation> + <translation><< klicka för att ändra ikon</translation> </message> <message> <location filename="sessionwidget.cpp" line="60"/> @@ -2230,7 +2231,7 @@ Example: <location filename="settingswidget.cpp" line="178"/> <source>Use SSH port forwarding to tunnel sound system connections through firewalls</source> - <translatorcomment>Hittade ingen bra översättning för "port forwarding"</translatorcomment> + <translatorcomment>Couldn't find a good translation for port forwarding.</translatorcomment> <translation>Använd SSH port forwarding för att tunnla ljudström genom brandväggar</translation> </message> diff --git a/x2goclient_zh_tw.ts b/x2goclient_zh_tw.ts index 142418c..9525470 100644 --- a/x2goclient_zh_tw.ts +++ b/x2goclient_zh_tw.ts @@ -1372,7 +1372,7 @@ Unsaved documents will be lost</source> </message> <message> <location filename="onmainwindow_part3.cpp" line="1522"/> - <source> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> + <source> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> <translation type="unfinished"></translation> </message> <message> hooks/post-receive -- x2goclient.git (X2Go 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 "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - master (branch) updated: 3.99.1.0-2-gc56b99a
by git-admin＠x2go.org 22 Feb '12

22 Feb '12

The branch, master has been updated via c56b99a96b23d2978231b5d3a892b658a727e363 (commit) from 4375d10a6834c67ddf638ea52a121d8e04840a0a (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 c56b99a96b23d2978231b5d3a892b658a727e363 Author: Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Date: Wed Feb 22 16:20:42 2012 +0100 Not including <netinet/in.h> on Q_OS_WIN platform. ----------------------------------------------------------------------- Summary of changes: config_win.bat | 1 + debian/changelog | 4 +++- sshprocess.h | 5 ++++- 3 files changed, 8 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/config_win.bat b/config_win.bat index 98f1987..695b3e2 100755 --- a/config_win.bat +++ b/config_win.bat @@ -1,4 +1,5 @@ mingw32-make distclean +lrelease x2goclient.pro set X2GO_CLIENT_TARGET= qmake diff --git a/debian/changelog b/debian/changelog index ecede52..ceeed80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ x2goclient (3.99.1.1-0~x2go1) UNRELEASED; urgency=low - * Continue development... + [ Oleksandr Shneyder ] + * New upstream version (3.99.1.1): + - not including <netinet/in.h> on Q_OS_WIN platform. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 Feb 2012 15:11:58 +0100 diff --git a/sshprocess.h b/sshprocess.h index 9d7a2b1..54e94b5 100644 --- a/sshprocess.h +++ b/sshprocess.h @@ -22,10 +22,13 @@ #ifndef SSHPROCESS_H #define SSHPROCESS_H -#include <netinet/in.h> #include <libssh/libssh.h> #include <QObject> +#ifndef Q_OS_WIN +#include <netinet/in.h> +#endif + class SshMasterConnection; hooks/post-receive -- x2goclient.git (X2Go 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 "x2goclient.git" (X2Go Client).

1 0

buildscripts.git - master (branch) updated: 6173a37e64502a3da443cc33de91fb14358bd035
by git-admin＠x2go.org 22 Feb '12

22 Feb '12

The branch, master has been updated via 6173a37e64502a3da443cc33de91fb14358bd035 (commit) from b085e56b5b5519a18f5b0f0f2e7ca607d149f598 (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 6173a37e64502a3da443cc33de91fb14358bd035 Author: X2Go Admin Account <x2go-admin(a)Debian-60-squeeze-64-minimal.(none)> Date: Wed Feb 22 15:59:59 2012 +0100 fix buildscripts's X2Go config x2go.conf ----------------------------------------------------------------------- Summary of changes: bin/build-all-packages | 4 ++++ home/.buildscripts/x2go.conf | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/bin/build-all-packages b/bin/build-all-packages index b493490..4ba2bb2 100755 --- a/bin/build-all-packages +++ b/bin/build-all-packages @@ -57,3 +57,7 @@ COMPONENT=${1:-""} fi done } + +echo "Component: $COMPONENT" +echo "Main: $COMPONENT_MAIN" +echo "Nightly: $COMPONENT_NIGHTLY" diff --git a/home/.buildscripts/x2go.conf b/home/.buildscripts/x2go.conf index e170ff4..c62cb67 100644 --- a/home/.buildscripts/x2go.conf +++ b/home/.buildscripts/x2go.conf @@ -39,7 +39,7 @@ pyhoca-gui $COMPONENT_NIGHTLY master\n\ pyhoca-cli $COMPONENT_NIGHTLY master\n\ x2gothinclient $COMPONENT_NIGHTLY master\ " -APP_PACKAGES_NIGHTLY=" +APP_PACKAGES_MAIN=" x2goserver $COMPONENT_MAIN build-main\n\ x2goagent $COMPONENT_MAIN build-main\n\ x2goclient $COMPONENT_MAIN build-main\n\ hooks/post-receive -- buildscripts.git (buildscripts upstream project) 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 "buildscripts.git" (buildscripts upstream project).

1 0

x2gognomebindings.git - master (branch) updated: 2.0.1.4-1-gae15cf9
by git-admin＠x2go.org 22 Feb '12

22 Feb '12

The branch, master has been updated via ae15cf9ba1b6f589bb18fa4a517532ced574d6c0 (commit) from 29f9bd2fa9019212350ccb9e0dc0e8660a6d89f9 (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 ae15cf9ba1b6f589bb18fa4a517532ced574d6c0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 22 15:42:09 2012 +0100 Continue development... ----------------------------------------------------------------------- Summary of changes: VERSION.x2gognomebindings | 2 +- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/VERSION.x2gognomebindings b/VERSION.x2gognomebindings index f9cca37..d17ac2c 100644 --- a/VERSION.x2gognomebindings +++ b/VERSION.x2gognomebindings @@ -1 +1 @@ -2.0.1.4 +2.0.1.5 diff --git a/debian/changelog b/debian/changelog index f36622a..956738d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2gognomebindings (2.0.1.5-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 Feb 2012 15:41:42 +0100 + x2gognomebindings (2.0.1.4-0~x2go1) unstable; urgency=low * New upstream version (2.0.1.4): hooks/post-receive -- x2gognomebindings.git (GNOME bindings for X2Go) 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 "x2gognomebindings.git" (GNOME bindings for X2Go).

1 0

x2golxdebindings.git - master (branch) updated: 1.0.1.2-1-g2ba405b
by git-admin＠x2go.org 22 Feb '12

22 Feb '12

The branch, master has been updated via 2ba405bc7413e112ae7003d13594c599ac35331f (commit) from 664dd319b029f4f781e341a002f10f84e7677f0d (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 2ba405bc7413e112ae7003d13594c599ac35331f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 22 15:35:41 2012 +0100 Continue development... ----------------------------------------------------------------------- Summary of changes: VERSION.x2golxdebindings | 2 +- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/VERSION.x2golxdebindings b/VERSION.x2golxdebindings index 5e75843..ba6c0fc 100644 --- a/VERSION.x2golxdebindings +++ b/VERSION.x2golxdebindings @@ -1 +1 @@ -1.0.1.2 +1.0.1.3 diff --git a/debian/changelog b/debian/changelog index 17fb343..e947602 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2golxdebindings (1.0.1.3-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 Feb 2012 15:35:29 +0100 + x2golxdebindings (1.0.1.2-0~x2go1) unstable; urgency=low * New upstream version (1.0.1.2): hooks/post-receive -- x2golxdebindings.git (LXDE bindings for X2Go) 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 "x2golxdebindings.git" (LXDE bindings for X2Go).

1 0

x2godesktopsharing.git - master (branch) updated: 3.0.1.4-1-g3faf290
by git-admin＠x2go.org 22 Feb '12

22 Feb '12

The branch, master has been updated via 3faf29061e1775e6a0fb5d68fa66e5d804d4e393 (commit) from 658b666654a419cf18bd68a3d8b3df54400287c4 (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 3faf29061e1775e6a0fb5d68fa66e5d804d4e393 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 22 15:14:04 2012 +0100 Continue development... ----------------------------------------------------------------------- Summary of changes: VERSION.x2godesktopsharing | 2 +- debian/changelog | 6 ++++++ sharetray.cpp | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/VERSION.x2godesktopsharing b/VERSION.x2godesktopsharing index 9bbc0c1..4913c2b 100644 --- a/VERSION.x2godesktopsharing +++ b/VERSION.x2godesktopsharing @@ -1 +1 @@ -3.0.1.4 +3.0.1.5 diff --git a/debian/changelog b/debian/changelog index 2126ba0..4fc14c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2godesktopsharing (3.0.1.5-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 Feb 2012 15:13:53 +0100 + x2godesktopsharing (3.0.1.4-0~x2go1) unstable; urgency=low * New upstream version (3.0.1.4): diff --git a/sharetray.cpp b/sharetray.cpp index 586a5b5..a019cce 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -35,7 +35,7 @@ #include <QProcess> #define STAT_ACT_COUNT 10 -#define VERSION "3.0.1.4" +#define VERSION "3.0.1.5" //needed to not get an undefined reference to static members int ShareTray::sigkeybintFd[2]; hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing for X2Go) 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 "x2godesktopsharing.git" (Desktop Sharing for X2Go).

1 0

x2goclient.git - master (branch) updated: 3.99.1.0-1-g4375d10
by git-admin＠x2go.org 22 Feb '12

22 Feb '12

The branch, master has been updated via 4375d10a6834c67ddf638ea52a121d8e04840a0a (commit) from 5f90e9ae43cecf2e82ec10ae93e64a854383f763 (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 4375d10a6834c67ddf638ea52a121d8e04840a0a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 22 15:12:15 2012 +0100 Continue development... ----------------------------------------------------------------------- Summary of changes: VERSION | 2 +- debian/changelog | 6 ++++++ desktop/x2goclient.desktop | 2 +- version.h | 2 +- x2goplugin.rc | 10 +++++----- 5 files changed, 14 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/VERSION b/VERSION index 57055b8..bac3e99 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.99.1.0 +3.99.1.1 diff --git a/debian/changelog b/debian/changelog index db8002c..ecede52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2goclient (3.99.1.1-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 Feb 2012 15:11:58 +0100 + x2goclient (3.99.1.0-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/desktop/x2goclient.desktop b/desktop/x2goclient.desktop index ba3e4ac..fd29411 100644 --- a/desktop/x2goclient.desktop +++ b/desktop/x2goclient.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Version=3.99.1.0 +Version=3.99.1.1 Type=Application Name=X2Go Client Exec=/usr/bin/x2goclient diff --git a/version.h b/version.h index 00471b6..60acdf9 100644 --- a/version.h +++ b/version.h @@ -1 +1 @@ -#define VERSION "3.99.1.0" +#define VERSION "3.99.1.1" diff --git a/x2goplugin.rc b/x2goplugin.rc index dde2abb..73ed229 100644 --- a/x2goplugin.rc +++ b/x2goplugin.rc @@ -1,8 +1,8 @@ 1 TYPELIB "x2goplugin.rc" 1 VERSIONINFO - FILEVERSION 3,99,1,0 - PRODUCTVERSION 3,99,1,0 + FILEVERSION 3,99,1,1 + PRODUCTVERSION 3,99,1,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -21,13 +21,13 @@ BEGIN VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0" VALUE "FileExtents", "x2go\0" VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0" - VALUE "FileVersion", "3, 99, 1 ,0\0" + VALUE "FileVersion", "3, 99, 1 ,1\0" VALUE "InternalName", "x2goplugin\0" VALUE "LegalCopyright", "Copyright � 2010-2012 Obviously Nice\0" VALUE "MIMEType", "application/x2go\0" VALUE "OriginalFilename", "npx2goplugin.dll\0" - VALUE "ProductName", "X2GoClient Plug-in 3.99.1.0\0" - VALUE "ProductVersion", "3, 99, 1, 0\0" + VALUE "ProductName", "X2GoClient Plug-in 3.99.1.1\0" + VALUE "ProductVersion", "3, 99, 1, 1\0" END END BLOCK "VarFileInfo" hooks/post-receive -- x2goclient.git (X2Go 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 "x2goclient.git" (X2Go Client).

1 0

x2goserver.git - master (branch) updated: 3.1.0.0-1-gdd4e3c8
by git-admin＠x2go.org 22 Feb '12

22 Feb '12

The branch, master has been updated via dd4e3c8884977e33ca053a93bb80b0a3102fc557 (commit) from 988da7922e3dc848d49c42ad2b6cff8fb2783297 (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 dd4e3c8884977e33ca053a93bb80b0a3102fc557 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 22 15:10:29 2012 +0100 Continue development... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ x2goserver-compat/VERSION.x2goserver-compat | 2 +- .../VERSION.x2goserver-extensions | 2 +- .../VERSION.x2goserver-fmbindings | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/VERSION.x2goserver | 2 +- 8 files changed, 13 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 84f0a9c..d08a77f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2goserver (3.1.0.1-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 Feb 2012 15:10:12 +0100 + x2goserver (3.1.0.0-0~x2go1) unstable; urgency=low [ Oleksandr Shneyder ] diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index 075493a..c59e32f 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -3.1.0.0 \ No newline at end of file +3.1.0.1 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index 075493a..c59e32f 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -3.1.0.0 \ No newline at end of file +3.1.0.1 \ No newline at end of file diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index f8d7555..a9e279d 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -3.1.0.0 +3.1.0.1 diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index 075493a..c59e32f 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -3.1.0.0 \ No newline at end of file +3.1.0.1 \ No newline at end of file diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index 075493a..c59e32f 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -3.1.0.0 \ No newline at end of file +3.1.0.1 \ No newline at end of file diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index 075493a..c59e32f 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -3.1.0.0 \ No newline at end of file +3.1.0.1 \ No newline at end of file diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index 075493a..c59e32f 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -3.1.0.0 \ No newline at end of file +3.1.0.1 \ No newline at end of file hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.11-1-ga8bf2dd
by git-admin＠x2go.org 22 Feb '12

22 Feb '12

The branch, master has been updated via a8bf2dd819ac55535b11e38848ffc9b076a5d307 (commit) from 50690ea177ee39011a235bac6887a213f27e7f54 (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 a8bf2dd819ac55535b11e38848ffc9b076a5d307 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 22 15:05:55 2012 +0100 Continue development... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 742e1b1..295c82e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +nx-libs (2:3.5.0.12-0) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 Feb 2012 15:05:38 +0100 + nx-libs (2:3.5.0.11-0) unstable; urgency=low [ Mike Gabriel ] hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

x2godesktopsharing.git - build-main (branch) updated: 3.0.1.4
by git-admin＠x2go.org 22 Feb '12

22 Feb '12

The branch, build-main has been updated via 658b666654a419cf18bd68a3d8b3df54400287c4 (commit) via a690be5601d3c174e75cfd969b6f5c7486644c60 (commit) via 2ff6a8d69fbd38a1762001ad596d684dd687bbbc (commit) via 27b99c493435ff3eff5d35b6ea6017c43ab687d8 (commit) via 1b133bce09ea92fda776803912eed3df8ecbb1ab (commit) via 3e0d14bdbf662648486030df7c70e4c787963a4c (commit) via b25cff23ce2bdddc3632e2b8f9fd39e7581afef6 (commit) from 0d8c6ada8efc63d78d114cd49cff08cbe281257e (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: VERSION.x2godesktopsharing | 2 +- debian/changelog | 10 ++++++++++ debian/control | 2 +- sharetray.cpp | 15 +++++++++------ 4 files changed, 21 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/VERSION.x2godesktopsharing b/VERSION.x2godesktopsharing index e9aef23..9bbc0c1 100644 --- a/VERSION.x2godesktopsharing +++ b/VERSION.x2godesktopsharing @@ -1 +1 @@ -3.0.1.3 +3.0.1.4 diff --git a/debian/changelog b/debian/changelog index 97f169f..2126ba0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +x2godesktopsharing (3.0.1.4-0~x2go1) unstable; urgency=low + + * New upstream version (3.0.1.4): + - Always use /tmp for lock and session sharing socket + (Fixes user individual temp dirs in Debian Edu / Skolelinux). + - Pass username of user who requests desktop sharing to x2gostartagent. + * Depend on x2goserver (>=3.0.99.9). + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 Feb 2012 15:00:54 +0100 + x2godesktopsharing (3.0.1.3-0~x2go1) unstable; urgency=low * New upstream version (3.0.1.3): diff --git a/debian/control b/debian/control index 94119f0..e9908a3 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, - x2goserver (>= 3.0.99.6-0~), + x2goserver (>= 3.0.99.9-0~), libqt4-gui, Recommends: Description: share X2go desktops with other users (via shadow sessions) diff --git a/sharetray.cpp b/sharetray.cpp index 2bf7dee..586a5b5 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -35,7 +35,7 @@ #include <QProcess> #define STAT_ACT_COUNT 10 -#define VERSION "3.0.1.3" +#define VERSION "3.0.1.4" //needed to not get an undefined reference to static members int ShareTray::sigkeybintFd[2]; @@ -74,10 +74,14 @@ ShareTray::ShareTray() setWindowFlags ( flags ); QString dispname=getenv ( "DISPLAY" ); - socketFname=QDir::tempPath() +"/x2godesktopsharing_@"+ - getenv ( "LOGNAME" ) +"@"+dispname; - lockFname=QDir::tempPath() +"/x2godesktopsharing.lock_"+ - getenv ( "LOGNAME" ) +"@"+dispname; + // socketFname=QDir::tempPath() +"x2godesktopsharing_@"+ + socketFname = "/tmp/x2godesktopsharing_@"; + socketFname += getenv ( "LOGNAME" ); + socketFname += "@" + dispname; + // lockFname=QDir::tempPath() +"x2godesktopsharing.lock_"+ + lockFname = "/tmp/x2godesktopsharing.lock_"; + lockFname += getenv ( "LOGNAME" ); + lockFname += "@" + dispname; if ( QFile::exists ( lockFname ) ) { QFile file ( lockFname ); @@ -366,7 +370,6 @@ QString ShareTray::getSocketAnswer ( QString message ) trayMessage ( tr ( "Access granted" ),QString ( tr ( "%1(%2): access granted" ) ).arg (remote_user ).arg ( client ) ); //start agent QProcess proc ( this ); - lst.removeAt ( 10 );; lst.removeAt ( 0 );; proc.start ( "x2gostartagent",lst ); if ( !proc.waitForFinished ( 5000 ) ) hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing for X2Go) 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 "x2godesktopsharing.git" (Desktop Sharing for X2Go).

1 0

← Newer
1
2
3
4
5
6
7
8
...
20
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits February 2012