[X2go-Commits] x2goclient.git - master (branch) updated: 3.99.0.2-13-ge21f0a4

X2go dev team git-admin at x2go.org
Tue Dec 27 16:11:44 CET 2011


The branch, master has been updated
       via  e21f0a417c83b3308821d7d1e06bbaed756c98a2 (commit)
      from  e3a8f0e81044aaa0d4ffacac742e80d6616c2b97 (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 e21f0a417c83b3308821d7d1e06bbaed756c98a2
Author: Oleksandr Shneyder <oleksandr.shneyder at treuchtlingen.de>
Date:   Tue Dec 27 16:06:06 2011 +0100

    add -lXpm in project file

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    1 +
 x2goclient.pro   |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 2c701c8..3a55b29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ x2goclient (3.99.0.3-0~x2go4) UNRELEASED; urgency=low
       on one of the existing displays.
     - Multi-display support: support for xinerama (temporarily disabled--support
       in x2goagent needed)
+    - add -lXpm in project file
 
  -- Oleksandr Shneyder <oleksandr.shneyder at treuchtlingen.de>  Tue, 27 Dec 2011 11:49:29 +0100
 
diff --git a/x2goclient.pro b/x2goclient.pro
index d10dfcb..5246b79 100755
--- a/x2goclient.pro
+++ b/x2goclient.pro
@@ -112,12 +112,12 @@ linux-g++ {
 }
 linux-g++-64 {
     message(building $$TARGET with ldap and cups)
-    LIBS += -lldap -lcups -lX11
+    LIBS += -lldap -lcups -lX11 -lXpm
 }
 x2go_linux_static {
     message (linking all libs statically)
     LIBS -= -lssh
-    LIBS += -lssh_static -lssl
+    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).




More information about the x2go-commits mailing list