[X2go-Commits] x2goagent.git - master (branch) updated: 3.5.0.2-9-gc4c3b57

X2go dev team git-admin at x2go.org
Mon Nov 21 21:05:02 CET 2011


The branch, master has been updated
       via  c4c3b57024e193d7db7b6775051887cd79a2b072 (commit)
      from  3130d50f7bddd42a03f36a7adf18f7b2f3f505dd (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 c4c3b57024e193d7db7b6775051887cd79a2b072
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Nov 21 21:04:58 2011 +0100

    Disable x2goagent-dbg package for now. Build depend on headers from nx-libs (2:3.5.0). Use an LD_LIBRARY_PATH compliant to nx-libs (2:3.5.0) in x2goagent wrapper script.

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

Summary of changes:
 debian/changelog    |    4 +++
 debian/control      |   61 ++++++++++++++++++++++++++------------------------
 debian/x2goagent.sh |    5 +---
 3 files changed, 37 insertions(+), 33 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 4601de7..c9dd7d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ x2goagent (3.5.0.5-0~x2go1) UNRELEASED; urgency=low
   * Patch for glcontextmodes.c taken from comparison between x2goagent in Git and
     a non-Git version of x2goagent.
   * Use version 3.5.0 in nxagent code (instead of version 3.5.0.5).
+  * Disable x2goagent-dbg package for now.
+  * Build depend on headers from nx-libs (2:3.5.0).
+  * Use an LD_LIBRARY_PATH compliant to nx-libs (2:3.5.0) in x2goagent wrapper
+    script.
 
  -- Oleksandr Shneyder <oleksandr.shneyder at treuchtlingen.de>  Tue, 04 Oct 2011 08:11:22 +0200
 
diff --git a/debian/control b/debian/control
index 9a914c6..7125d9d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,9 @@ Priority: extra
 Maintainer: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
 Build-Depends:
  debhelper (>= 7),
- libxcomp-dev (>= 3.5.0),
- libxcompext-dev (>= 3.5.0),
- libxcompshad-dev (>= 3.5.0),
+ libxcomp-dev (>= 2:3.5.0),
+ libxcompext-dev (>= 2:3.5.0),
+ libxcompshad-dev (>= 2:3.5.0),
  zlib1g-dev,
  libfreetype6-dev,
  xorg-dev,
@@ -19,6 +19,9 @@ Vcs-Browser: http://code.x2go.org/gitweb?p=x2goagent.git;a=summary
 Package: x2goagent
 Architecture: any
 Depends:
+ libxcomp3 (>= 2:3.5.0-0~),
+ libxcompext3 (>= 3:3.5.0-0~),
+ libxcompshad3 (>= 3:3.5.0-0~),
  ${shlibs:Depends},
  ${misc:Depends}
 Description: Special X2go-ized X agent, forked from NX-X11 (NoMachine)
@@ -36,29 +39,29 @@ Description: Special X2go-ized X agent, forked from NX-X11 (NoMachine)
  requests locally, ensuring that the most common source of round-trips are nearly
  reduced to zero.
 
-Package: x2goagent-dbg
-Architecture: any
-Depends:
- libxcomp-dbg,
- libxcompext-dbg,
- libxcompshad-dbg,
- ${shlibs:Depends},
- ${misc:Depends}
-Priority: extra
-Section: debug
-Description: Special X2go-ized X agent, forked from NX-X11 (NoMachine)
- x2goagent is an agent providing X transport of X sessions. The application
- is based on the well known Xnest "nested" server. x2goagent, like Xnest,
- is an X server for its own clients, and at the same time, an X client
- for a system's local X server.
- .
- The main scope of x2goagent is to eliminate X round-trips or transform
- them into asynchronous replies. x2goagent works together with nxproxy from
- NoMachine. nxproxy itself does not make any effort to minimize round-trips
- by itself, this is demanded of x2goagent.
- .
- Being an X server, x2goagent is able to resolve all the property/atoms related
- requests locally, ensuring that the most common source of round-trips are nearly
- reduced to zero.
- .
- This package contains the debug symbols of x2goagent.
\ No newline at end of file
+#Package: x2goagent-dbg
+#Architecture: any
+#Depends:
+# libxcomp-dbg,
+# libxcompext-dbg,
+# libxcompshad-dbg,
+# ${shlibs:Depends},
+# ${misc:Depends}
+#Priority: extra
+#Section: debug
+#Description: Special X2go-ized X agent, forked from NX-X11 (NoMachine)
+# x2goagent is an agent providing X transport of X sessions. The application
+# is based on the well known Xnest "nested" server. x2goagent, like Xnest,
+# is an X server for its own clients, and at the same time, an X client
+# for a system's local X server.
+# .
+# The main scope of x2goagent is to eliminate X round-trips or transform
+# them into asynchronous replies. x2goagent works together with nxproxy from
+# NoMachine. nxproxy itself does not make any effort to minimize round-trips
+# by itself, this is demanded of x2goagent.
+# .
+# Being an X server, x2goagent is able to resolve all the property/atoms related
+# requests locally, ensuring that the most common source of round-trips are nearly
+# reduced to zero.
+# .
+# This package contains the debug symbols of x2goagent.
diff --git a/debian/x2goagent.sh b/debian/x2goagent.sh
index 6e69888..c801a50 100644
--- a/debian/x2goagent.sh
+++ b/debian/x2goagent.sh
@@ -1,9 +1,6 @@
 #!/bin/bash
 
-X2GO_LIBS=/usr/lib/x2go
-LD_LIBRARY_PATH=/usr/lib/x2go
-
-export X2GO_LIBS
+LD_LIBRARY_PATH=/usr/lib/nx:/usr/lib/nx/X11
 export LD_LIBRARY_PATH
 
 exec /usr/lib/x2go/x2goagent "$@"


hooks/post-receive
-- 
x2goagent.git (X2go (NX-like) Agent)

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 "x2goagent.git" (X2go (NX-like) Agent).




More information about the x2go-commits mailing list