[X2Go-Commits] nx-libs.git - build-baikal (branch) updated: redist-client/3.5.0.10-7-g4eae840
X2Go dev team
git-admin at x2go.org
Fri Aug 30 16:25:02 CEST 2013
The branch, build-baikal has been updated
via 4eae840bd56bda22b7bf6c9a55f1118ed62461e4 (commit)
from 54792fe297c0965c5c5d3a5db0280d064e2d7fa2 (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:
debian/changelog | 2 ++
.../111_nxcomp_byerace.full+lite.patch} | 8 +++-----
debian/patches/series | 1 +
3 files changed, 6 insertions(+), 5 deletions(-)
copy debian/{patches-pending-evaluation/patches_byerace.patch => patches/111_nxcomp_byerace.full+lite.patch} (68%)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 012c7bd..0c2c3ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ 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.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Tue, 07 Feb 2012 13:48:19 +0100
diff --git a/debian/patches-pending-evaluation/patches_byerace.patch b/debian/patches/111_nxcomp_byerace.full+lite.patch
similarity index 68%
copy from debian/patches-pending-evaluation/patches_byerace.patch
copy to debian/patches/111_nxcomp_byerace.full+lite.patch
index 1a94f4b..ff0f41c 100644
--- a/debian/patches-pending-evaluation/patches_byerace.patch
+++ b/debian/patches/111_nxcomp_byerace.full+lite.patch
@@ -1,8 +1,6 @@
-Index: nxcomp-3.2.0-7/Loop.cpp
-===================================================================
---- nxcomp-3.2.0-7.orig/Loop.cpp 2008-09-23 19:20:51.000000000 +0200
-+++ nxcomp-3.2.0-7/Loop.cpp 2008-09-23 19:20:21.000000000 +0200
-@@ -7329,6 +7329,18 @@
+--- a/nxcomp/Loop.cpp
++++ b/nxcomp/Loop.cpp
+@@ -7321,6 +7321,18 @@
<< logofs_flush;
#endif
diff --git a/debian/patches/series b/debian/patches/series
index 9133bf6..434e86a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -33,6 +33,7 @@
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
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)).
More information about the x2go-commits
mailing list