[X2go-Commits] nx-libs.git - master (branch) updated: redist-client/3.5.0.10-9-g4473c3a

[X2go dev team]

The branch, master has been updated
       via  4473c3ab9c4ea4ece35fcc1da1608179404d9fba (commit)
       via  ec72377982314efccbc8597a65ec364b8b75d251 (commit)
      from  4eae840bd56bda22b7bf6c9a55f1118ed62461e4 (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 4473c3ab9c4ea4ece35fcc1da1608179404d9fba
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Feb 11 23:39:16 2012 +0100

    Do not install libXinerama directly into /usr/lib/nx. Recommended method is installing to /usr/lib/nx/Xinerama, so that you can enable/disable usage of the Xinerama extension.

commit ec72377982314efccbc8597a65ec364b8b75d251
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Feb 11 23:06:58 2012 +0100

    Revert "Add patch: 111_nxcomp_byerace.full+lite.patch. Work around race condition in qtnx and libnxcl."
    
    This reverts commit 4eae840bd56bda22b7bf6c9a55f1118ed62461e4. It does not fix qtnx failures that occur with
    this version of nxagent.

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

Summary of changes:
 debian/changelog                                  |    5 +++--
 debian/patches/111_nxcomp_byerace.full+lite.patch |   21 ---------------------
 debian/patches/series                             |    1 -
 debian/post-build-nx.sh                           |    6 ++++++
 4 files changed, 9 insertions(+), 24 deletions(-)
 delete mode 100644 debian/patches/111_nxcomp_byerace.full+lite.patch

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 0c2c3ca..35df3c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low
 
   * Use ,,$(MAKE) -C'' in main Makefile for calling Makefiles in subdirectories,
     make build stanza work for nx-libs-full and nx-libs-lite.
-  * Add patch: 111_nxcomp_byerace.full+lite.patch. Work around race condition in
-    qtnx and libnxcl.
+  * Do not install libXinerama directly into /usr/lib/nx. Recommended method is
+    installing to /usr/lib/nx/Xinerama, so that you can enable/disable usage of
+    the Xinerama extension.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 07 Feb 2012 13:48:19 +0100
 
diff --git a/debian/patches/111_nxcomp_byerace.full+lite.patch b/debian/patches/111_nxcomp_byerace.full+lite.patch
deleted file mode 100644
index ff0f41c..0000000
--- a/debian/patches/111_nxcomp_byerace.full+lite.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/nxcomp/Loop.cpp
-+++ b/nxcomp/Loop.cpp
-@@ -7321,6 +7321,18 @@
-           << logofs_flush;
-   #endif
- 
-+  // Henning Heinold
-+  // fix up error from libnxcl where bye can be in front of NXPROXY
-+  if (strncmp(options, "bye", strlen("bye")) == 0)
-+  {
-+	  int bye_length = strlen("bye");
-+	  char *moo = &options[bye_length+1];
-+
-+	  memmove(options, moo, DEFAULT_REMOTE_OPTIONS_LENGTH-bye_length-1);
-+	  *logofs << "Loop: Cleanded the bye in options, options now looks '"
-+		              << options << "'.\n" << logofs_flush;
-+  }
-+
-   if (strncmp(options, "NXPROXY-", strlen("NXPROXY-")) != 0)
-   {
-     #ifdef PANIC
diff --git a/debian/patches/series b/debian/patches/series
index 434e86a..9133bf6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -33,7 +33,6 @@
 108_nxagent_wine-close-delay.full.patch
 109_nxagent_locale-utf8-compound-text.full.patch
 110_nxagent_createpixmap-bounds-check.full.patch
-111_nxcomp_byerace.full+lite.patch
 200_nxagent_check-binary-x2go-flavour.full.patch
 201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch
 202_nx-x11_enable-xinerama.full.patch
diff --git a/debian/post-build-nx.sh b/debian/post-build-nx.sh
index 0724e19..9a6143c 100755
--- a/debian/post-build-nx.sh
+++ b/debian/post-build-nx.sh
@@ -13,11 +13,17 @@ cp -aL nx-X11/exports/include/* nx-X11/.build-exports/include
 find nx-X11/exports/lib/ | egrep "^.*\.so$" | while read libpath; do
     libfile=$(basename $libpath)
     libdir=$(dirname $libpath)
+
     mkdir -p ${libdir//exports/.build-exports}
     cp -L $libpath ${libdir//exports/.build-exports}
+
     find $libdir/$libfile.* | while read symlink; do
         ln -s $libfile ${libdir//exports/.build-exports}/$(basename $symlink)
     done
+
+    # do not install libXinerama into default path...
+    rm -f ${libdir//exports/.build-exports}/lib/libXinerama*
+
 done
 
 exit 0


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)).