The branch, master has been updated via d0496cfb819e06523bb056dc6e5f6caa5f7bf28a (commit) from 4658ef38188f4bd0f18ca31679b69b919f939d56 (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 d0496cfb819e06523bb056dc6e5f6caa5f7bf28a Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> Date: Tue Sep 4 15:28:58 2012 +0200 add DEFINES += __linux__ to project file when building linux binaries (need to define Q_OS_LINUX in moc generator) ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++-- x2goclient.pro | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 422655a..649e7e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2goclient (3.99.2.3-0~x2go3) UNRELEASED; urgency=low +x2goclient (3.99.2.3-0~x2go4) UNRELEASED; urgency=low [ Mike Gabriel ] * New upstream version (3.99.2.2): @@ -12,8 +12,9 @@ x2goclient (3.99.2.3-0~x2go3) UNRELEASED; urgency=low * Add settings for direct RDP connection * Implement direct RDP connection using standalone client * Build direct RDP feature only for linux + * add DEFINES += __linux__ to project file when building linux binaries (need to define Q_OS_LINUX in moc generator) - -- Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> Tue, 04 Sep 2012 12:13:43 +0200 + -- Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> Tue, 04 Sep 2012 15:27:55 +0200 x2goclient (3.99.2.2-0~x2go2) unstable; urgency=low diff --git a/x2goclient.pro b/x2goclient.pro index 1228f01..8a0f1e5 100755 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -140,13 +140,16 @@ RESOURCES += resources.rcc linux-g++ { message(building $$TARGET with ldap and cups) LIBS += -lldap -lcups -lX11 -lXpm + DEFINES += __linux__ } linux-g++-64 { message(building $$TARGET with ldap and cups) LIBS += -lldap -lcups -lX11 -lXpm + DEFINES += __linux__ } x2go_linux_static { message (linking all libs statically) + DEFINES += __linux__ LIBS -= -lssh LIBS += -lssh_static -lssl -lXpm QMAKE_LFLAGS = -Bstatic $$QMAKE_LFLAGS 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).